X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO-SDN-juniper_contrail%2Fosm_rosdn_juniper_contrail%2Fsdn_api.py;fp=RO-SDN-juniper_contrail%2Fosm_rosdn_juniper_contrail%2Fsdn_api.py;h=c99452bb99c019d8477364d764efd7332975370c;hp=2bf0b52f839890f7602c4986365c883439eea3ae;hb=71f7abb8d48b167749e7b03586def13bff0c8a41;hpb=0000918af57526534fabe13007abf1b042ebe6d5 diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py index 2bf0b52f..c99452bb 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py @@ -20,8 +20,9 @@ import json from osm_ro.wim.sdnconn import SdnConnectorError from osm_rosdn_juniper_contrail.rest_lib import ContrailHttp from osm_rosdn_juniper_contrail.rest_lib import NotFound -from osm_rosdn_juniper_contrail.rest_lib import DuplicateFound -from osm_rosdn_juniper_contrail.rest_lib import HttpException +# from osm_rosdn_juniper_contrail.rest_lib import DuplicateFound +# from osm_rosdn_juniper_contrail.rest_lib import HttpException + class UnderlayApi: """ Class with CRUD operations for the underlay API """ @@ -61,7 +62,7 @@ class UnderlayApi: self.logger.debug("Config parameters for the underlay controller: auth_url: {}, project: {}," " domain: {}, user: {}, password: {}".format(self.auth_url, self.project, - self.domain, self.user, self.password)) + self.domain, self.user, self.password)) auth_dict = {} auth_dict['auth'] = {} @@ -142,9 +143,7 @@ class UnderlayApi: "operation": "DELETE" } endpoint = self.controller_url + "ref-update" - resp = self.http.post_cmd(url=endpoint, - headers=self.http_header, - post_fields_dict=payload) + resp = self.http.post_cmd(url=endpoint, headers=self.http_header, post_fields_dict=payload) return resp # Aux methods to avoid code duplication of name conventions @@ -230,11 +229,10 @@ class UnderlayApi: return self.get_by_uuid(self.controller_url, "virtual-port-group", vpg_id) def get_vpg_by_name(self, vpg_name): - fq_name = [ - "default-global-system-config", - self.fabric, - vpg_name - ] + fq_name = ["default-global-system-config", + self.fabric, + vpg_name + ] return self.get_by_fq_name("virtual-port-group", fq_name) def delete_vpg(self, vpg_id): @@ -321,4 +319,3 @@ class UnderlayApi: def unref_vmi_vpg(self, vpg_id, vmi_id, vmi_fq_name): self.delete_ref("virtual-port-group", vpg_id, "virtual-machine-interface", vmi_id, vmi_fq_name) -