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_assist_juniper_contrail.py;h=08947130a771b1e8efb41cf467d9141f4a391e39;hp=6714132ea6d90b229ec5ee83e9fbfb1052301890;hb=HEAD;hpb=049cbb1b256805f589c24776dcf092c77fefec6a diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py index 6714132e..08947130 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_assist_juniper_contrail.py @@ -80,6 +80,7 @@ class JuniperContrail(SdnConnectorBase): self.fabric = None overlay_url = None self.vni_range = None + self.verify = True if config: auth_url = config.get("auth_url") @@ -90,6 +91,23 @@ class JuniperContrail(SdnConnectorBase): self.overlay_url = config.get("overlay_url") self.vni_range = config.get("vni_range") + if config.get("insecure") and config.get("ca_cert"): + raise SdnConnectorError( + "options insecure and ca_cert are mutually exclusive" + ) + + if config.get("ca_cert"): + self.verify = config.get("ca_cert") + + elif config.get("insecure"): + self.verify = False + + else: + raise SdnConnectorError( + "certificate should provided or ssl verification should be " + "disabled by setting insecure as True in sdn/wim config." + ) + if not url: raise SdnConnectorError("'url' must be provided") @@ -150,6 +168,7 @@ class JuniperContrail(SdnConnectorBase): "domain": self.domain, "asn": self.asn, "fabric": self.fabric, + "verify": self.verify, } self.underlay_api = UnderlayApi( url, @@ -194,9 +213,6 @@ class JuniperContrail(SdnConnectorBase): def get_url(self): return self.url - def get_overlay_url(self): - return self.overlay_url - def _create_port(self, switch_id, switch_port, network, vlan): """ 1 - Look for virtual port groups for provided switch_id, switch_port using name