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=a1cc3ded08824d66eacea6dda0f7fb975ca710b7;hp=b3d3eb495d7188ddcabdd6968b08692a4103f673;hb=e493e9b91720e5116e00b4c06cf66c767bccce2f;hpb=d0f7e798d3462027dc2c8d612a89600f4a6bad3e 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 b3d3eb49..a1cc3ded 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 @@ -18,16 +18,14 @@ # import logging -import json import yaml import random -from osm_ro.wim.sdnconn import SdnConnectorBase, SdnConnectorError -from osm_rosdn_juniper_contrail.rest_lib import ContrailHttp -from osm_rosdn_juniper_contrail.rest_lib import NotFound +from osm_ro_plugin.sdnconn import SdnConnectorBase, 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.sdn_api import UnderlayApi @@ -37,10 +35,11 @@ class JuniperContrail(SdnConnectorBase): whose API details can be found in these links: - https://github.com/tonyliu0592/contrail/wiki/API-Configuration-REST - - https://www.juniper.net/documentation/en_US/contrail19/information-products/pathway-pages/api-guide-1910/tutorial_with_rest.html + - https://www.juniper.net/documentation/en_US/contrail19/information-products/pathway-pages/api-guide-1910/ + tutorial_with_rest.html - https://github.com/tonyliu0592/contrail-toolbox/blob/master/sriov/sriov """ - _WIM_LOGGER = "openmano.sdnconn.junipercontrail" + _WIM_LOGGER = "ro.sdn.junipercontrail" def __init__(self, wim, wim_account, config=None, logger=None): """ @@ -63,7 +62,7 @@ class JuniperContrail(SdnConnectorBase): datacenter_id vim_account vim_account id: (internal, do not use) wim_id: (internal, do not use) - :param logger (logging.Logger): optional logger object. If none is passed 'openmano.sdn.sdnconn' is used. + :param logger (logging.Logger): optional logger object. If none is passed 'ro.sdn.sdnconn' is used. """ self.logger = logger or logging.getLogger(self._WIM_LOGGER) self.logger.debug('wim: {}, wim_account: {}, config: {}'.format(wim, wim_account, config)) @@ -72,7 +71,7 @@ class JuniperContrail(SdnConnectorBase): self.user = wim_account.get("user") self.password = wim_account.get("password") - url = wim.get("wim_url") # underlay url + url = wim.get("wim_url") # underlay url auth_url = None self.project = None self.domain = None @@ -148,10 +147,10 @@ class JuniperContrail(SdnConnectorBase): Returns: VNI """ - #find unused VLAN ID + # find unused VLAN ID for vlanID_range in self.vni_range: try: - start_vni , end_vni = map(int, vlanID_range.replace(" ", "").split("-")) + start_vni, end_vni = map(int, vlanID_range.replace(" ", "").split("-")) for i in range(start_vni, end_vni + 1): vni = random.randrange(start_vni, end_vni, 1) if vni not in self.used_vni: @@ -159,10 +158,9 @@ class JuniperContrail(SdnConnectorBase): except Exception as exp: raise SdnConnectorError("Exception {} occurred while searching a free VNI.".format(exp)) else: - raise SdnConnectorError("Unable to create the virtual network."\ - " All VNI in VNI range {} are in use.".format(self.vni_range)) + raise SdnConnectorError("Unable to create the virtual network." + " All VNI in VNI range {} are in use.".format(self.vni_range)) - # Aux functions for testing def get_url(self): return self.url @@ -216,7 +214,6 @@ class JuniperContrail(SdnConnectorBase): else: num_vmis = len(vmi_list) for vmi in vmi_list: - uuid = vmi.get("uuid") fqdn = vmi.get("to") # check by name if fqdn[2] == vmi_name: @@ -306,7 +303,6 @@ class JuniperContrail(SdnConnectorBase): self.logger.error('Exception getting connectivity service info: %s', e, exc_info=True) return {'sdn_status': 'ERROR', 'error_msg': str(e)} - def create_connectivity_service(self, service_type, connection_points, **kwargs): """ Establish SDN/WAN connectivity between the endpoints @@ -353,7 +349,8 @@ class JuniperContrail(SdnConnectorBase): # 1.3 If more than one, ERROR # Step 2. Modify the existing virtual network in the overlay controller # 2.1 Add VNI (VxLAN Network Identifier - one free from the provided range) - # 2.2 Add RouteTarget (RT) ('ASN:VNI', ASN = Autonomous System Number, provided as param or read from controller config) + # 2.2 Add RouteTarget (RT) ('ASN:VNI', ASN = Autonomous System Number, provided as param or read from + # controller config) # Step 3. Create a virtual network in the underlay controller # 3.1 Create virtual network (name, VNI, RT) # If the network already existed in the overlay controller, we should use the same name @@ -369,38 +366,35 @@ class JuniperContrail(SdnConnectorBase): # Initialize data conn_info = None - # 1 - Filter connection_points (transform cp to a dictionary with no duplicates) # This data will be returned even if no cp can be created if something is created - vlans = set() work_cps = {} for cp in connection_points: switch_id = cp.get("service_endpoint_encapsulation_info").get("switch_dpid") switch_port = cp.get("service_endpoint_encapsulation_info").get("switch_port") service_endpoint_id = cp.get("service_endpoint_id") - vlans.add(cp.get("service_endpoint_encapsulation_info").get("vlan")) cp_name = self.underlay_api.get_vpg_name(switch_id, switch_port) add_cp = work_cps.get(cp_name) if not add_cp: - # add cp to dict - service_endpoint_ids = [] - service_endpoint_ids.append(service_endpoint_id) - add_cp = {"service_endpoint_ids": service_endpoint_ids, - "switch_dpid": switch_id, - "switch_port": switch_port} - work_cps[cp_name] = add_cp + # check cp has vlan + vlan = cp.get("service_endpoint_encapsulation_info").get("vlan") + if vlan: + # add cp to dict + service_endpoint_ids = [] + service_endpoint_ids.append(service_endpoint_id) + add_cp = {"service_endpoint_ids": service_endpoint_ids, + "switch_dpid": switch_id, + "switch_port": switch_port, + "vlan": vlan} + work_cps[cp_name] = add_cp + else: + self.logger.warning("cp service_endpoint_id : {} has no vlan, ignore".format( + service_endpoint_id)) else: # add service_endpoint_id to list service_endpoint_ids = add_cp["service_endpoint_ids"] service_endpoint_ids.append(service_endpoint_id) - # check vlan - if len(vlans) == 1: - vlan = vlans.pop() - self.logger.debug("Provided vlan: {}".format(vlan)) - else: - raise SdnConnectorError("Provided more than one vlan") - # 2 - Obtain free VNI vni = self._generate_vni() self.logger.debug("VNI: {}".format(vni)) @@ -426,16 +420,16 @@ class JuniperContrail(SdnConnectorBase): conn_info = { "vnet": { "uuid": vnet_id, - "name": vnet_name, - "vlan": vlan + "name": vnet_name }, - "connection_points": work_cps # dict with port_name as key + "connection_points": work_cps # dict with port_name as key } # 4 - Create a port for each endpoint for cp in work_cps.values(): switch_id = cp.get("switch_dpid") switch_port = cp.get("switch_port") + vlan = cp.get("vlan") vpg_id, vmi_id = self._create_port(switch_id, switch_port, vnet_name, vlan) cp["vpg_id"] = vpg_id cp["vmi_id"] = vmi_id @@ -450,7 +444,6 @@ class JuniperContrail(SdnConnectorBase): else: self.logger.error("Error creating connectivity service: {}".format(e), exc_info=True) - # If nothing is created raise error else return what has been created and mask as error if not conn_info: raise SdnConnectorError("Exception create connectivity service: {}".format(str(e))) @@ -474,22 +467,21 @@ class JuniperContrail(SdnConnectorBase): :raises: SdnConnectorException: In case of error. The parameter http_code must be filled """ self.logger.info("delete_connectivity_service vnet_name: {}, connection_points: {}". - format(service_uuid, conn_info)) + format(service_uuid, conn_info)) try: vnet_uuid = service_uuid - vnet_name = conn_info["vnet"]["name"] # always should exist as the network is the first thing created + # vnet_name = conn_info["vnet"]["name"] # always should exist as the network is the first thing created work_cps = conn_info["connection_points"] - vlan = conn_info["vnet"]["vlan"] # 1: For each connection point delete vlan from vpg and it is is the # last one, delete vpg for cp in work_cps.values(): - self._delete_port(cp.get("switch_dpid"), cp.get("switch_port"), vlan) + self._delete_port(cp.get("switch_dpid"), cp.get("switch_port"), cp.get("vlan")) # 2: Delete vnet self.underlay_api.delete_virtual_network(vnet_uuid) - self.logger.info("deleted connectivity_service vnet_name: {}, connection_points: {}". + self.logger.info("deleted connectivity_service vnet_uuid: {}, connection_points: {}". format(service_uuid, conn_info)) except SdnConnectorError: raise @@ -500,20 +492,7 @@ class JuniperContrail(SdnConnectorBase): self.logger.error("Error deleting connectivity service: {}".format(e), exc_info=True) raise SdnConnectorError("Exception deleting connectivity service: {}".format(str(e))) - # Helper methods - @staticmethod - def _get_vlan(connection_points): - vlan = None - for cp in connection_points: - cp_vlan = cp.get("service_endpoint_encapsulation_info").get("vlan") - if not vlan: - vlan = cp_vlan - else: - if vlan != cp_vlan: - raise SdnConnectorError("More that one cp provided") - return vlan - - def edit_connectivity_service(self, service_uuid, conn_info = None, connection_points = None, **kwargs): + def edit_connectivity_service(self, service_uuid, conn_info=None, connection_points=None, **kwargs): """ Change an existing connectivity service. This method's arguments and return value follow the same convention as @@ -539,11 +518,10 @@ class JuniperContrail(SdnConnectorBase): # 3 - Delete unnecesary ports # 4 - Add new ports self.logger.info("edit connectivity service, service_uuid: {}, conn_info: {}, " - "connection points: {} ".format(service_uuid, conn_info, connection_points)) + "connection points: {} ".format(service_uuid, conn_info, connection_points)) # conn_info should always exist and have connection_points and vnet elements old_cp = conn_info.get("connection_points", {}) - old_vlan = conn_info.get("vnet", {}).get("vlan") # Check if an element of old_cp is marked as error, in case it is delete it # Not return a new conn_info in this case because it is only partial information @@ -554,6 +532,7 @@ class JuniperContrail(SdnConnectorBase): if cp.get("sdn_status") == "ERROR": switch_id = cp.get("switch_dpid") switch_port = cp.get("switch_port") + old_vlan = cp.get("vlan") self._delete_port(switch_id, switch_port, old_vlan) deleted_ports.append(self.underlay_api.get_vpg_name(switch_id, switch_port)) @@ -561,7 +540,7 @@ class JuniperContrail(SdnConnectorBase): del old_cp[port] # Delete sdn_status and sdn_info if exists (possibly marked as error) - if conn_info.get("vnet",{}).get("sdn_status"): + if conn_info.get("vnet", {}).get("sdn_status"): del conn_info["vnet"]["sdn_status"] except HttpException as e: self.logger.error("Error trying to delete old ports marked as error: {}".format(e)) @@ -577,35 +556,33 @@ class JuniperContrail(SdnConnectorBase): # Check and obtain what should be added and deleted, if there is an error here raise an exception try: - vlans = set() work_cps = {} for cp in connection_points: switch_id = cp.get("service_endpoint_encapsulation_info").get("switch_dpid") switch_port = cp.get("service_endpoint_encapsulation_info").get("switch_port") service_endpoint_id = cp.get("service_endpoint_id") - vlans.add(cp.get("service_endpoint_encapsulation_info").get("vlan")) cp_name = self.underlay_api.get_vpg_name(switch_id, switch_port) add_cp = work_cps.get(cp_name) if not add_cp: # add cp to dict - service_endpoint_ids = [] - service_endpoint_ids.append(service_endpoint_id) - add_cp = {"service_endpoint_ids": service_endpoint_ids, - "switch_dpid": switch_id, - "switch_port": switch_port} - work_cps[cp_name] = add_cp + # check cp has vlan + vlan = cp.get("service_endpoint_encapsulation_info").get("vlan") + if vlan: + service_endpoint_ids = [] + service_endpoint_ids.append(service_endpoint_id) + add_cp = {"service_endpoint_ids": service_endpoint_ids, + "switch_dpid": switch_id, + "switch_port": switch_port, + "vlan": vlan} + work_cps[cp_name] = add_cp + else: + self.logger.warning("cp service_endpoint_id : {} has no vlan, ignore". + format(service_endpoint_id)) else: # add service_endpoint_id to list service_endpoint_ids = add_cp["service_endpoint_ids"] service_endpoint_ids.append(service_endpoint_id) - # check vlan - if len(vlans) == 1: - vlan = vlans.pop() - self.logger.debug("Provided vlan: {}".format(vlan)) - else: - raise SdnConnectorError("Provided more than one vlan") - old_port_list = list(old_cp.keys()) port_list = list(work_cps.keys()) to_delete_ports = list(set(old_port_list) - set(port_list)) @@ -639,7 +616,7 @@ class JuniperContrail(SdnConnectorBase): cp = conn_info_cp[port_name] switch_id = cp.get("switch_dpid") switch_port = cp.get("switch_port") - self.logger.debug("delete port switch_id, switch_port: {}".format(switch_id, switch_port)) + self.logger.debug("delete port switch_id={}, switch_port={}".format(switch_id, switch_port)) self._delete_port(switch_id, switch_port, vlan) deleted_ports.append(port_name) @@ -652,7 +629,8 @@ class JuniperContrail(SdnConnectorBase): if port_name in to_add_ports: switch_id = cp.get("switch_dpid") switch_port = cp.get("switch_port") - self.logger.debug("add port switch_id, switch_port: {}".format(switch_id, switch_port)) + vlan = cp.get("vlan") + self.logger.debug("add port switch_id={}, switch_port={}".format(switch_id, switch_port)) vpg_id, vmi_id = self._create_port(switch_id, switch_port, vnet_name, vlan) cp_added = cp.copy() cp_added["vpg_id"] = vpg_id @@ -702,9 +680,9 @@ if __name__ == '__main__': log_formatter = logging.Formatter(log_format, datefmt='%Y-%m-%dT%H:%M:%S') handler = logging.StreamHandler() handler.setFormatter(log_formatter) - logger = logging.getLogger('openmano.sdnconn.junipercontrail') - #logger.setLevel(level=logging.ERROR) - #logger.setLevel(level=logging.INFO) + logger = logging.getLogger('ro.sdn.junipercontrail') + # logger.setLevel(level=logging.ERROR) + # logger.setLevel(level=logging.INFO) logger.setLevel(level=logging.DEBUG) logger.addHandler(handler) @@ -724,17 +702,16 @@ if __name__ == '__main__': vni = juniper_contrail._generate_vni() juniper_contrail.used_vni.add(vni) print(juniper_contrail.used_vni) - #juniper_contrail.used_vni.remove(1000003) + # juniper_contrail.used_vni.remove(1000003) print(juniper_contrail.used_vni) for i in range(2): vni = juniper_contrail._generate_vni() juniper_contrail.used_vni.add(vni) print(juniper_contrail.used_vni) - # 0. Check credentials print('0. Check credentials') - #juniper_contrail.check_credentials() + # juniper_contrail.check_credentials() # 1 - Create and delete connectivity service conn_point_0 = { @@ -798,4 +775,3 @@ if __name__ == '__main__': logger.debug("Delete connectivity service 2") juniper_contrail.delete_connectivity_service(service_id2, conn_info2) logger.debug("Delete Ok") -