Resolve: "(CNIT) Multi-Granular Optical Nodes and Optical Transpoders management"

Closes #108 (closed) and #153 (closed)

src/common/tools/descriptor/Loader.py

@@ -128,21 +128,16 @@ class DescriptorLoader:
 
         self.__num_workers = num_workers
 
-        self.__dummy_mode  = self.__descriptors.get('dummy_mode' , False)
-        self.__contexts    = self.__descriptors.get('contexts'   , [])
-        self.__topologies  = self.__descriptors.get('topologies' , [])
-        self.__devices     = self.__descriptors.get('devices'    , [])
-        self.__links       = self.__descriptors.get('links'      , [])
-        self.__services    = self.__descriptors.get('services'   , [])
-        self.__slices      = self.__descriptors.get('slices'     , [])
-        self.__ietf_slices = self.__descriptors.get('ietf-network-slice-service:network-slice-services', {})
-        self.__connections = self.__descriptors.get('connections', [])
-        
-        #--------------- Experimental Optical Link --------------
-        
-        self.__optical_links = self.__descriptors.get("optical_links",[])
-        
-        
+        self.__dummy_mode    = self.__descriptors.get('dummy_mode' ,  False)
+        self.__contexts      = self.__descriptors.get('contexts'   ,  [])
+        self.__topologies    = self.__descriptors.get('topologies' ,  [])
+        self.__devices       = self.__descriptors.get('devices'    ,  [])
+        self.__links         = self.__descriptors.get('links'      ,  [])
+        self.__services      = self.__descriptors.get('services'   ,  [])
+        self.__slices        = self.__descriptors.get('slices'     ,  [])
+        self.__ietf_slices   = self.__descriptors.get('ietf-network-slice-service:network-slice-services', {})
+        self.__connections   = self.__descriptors.get('connections',  [])
+        self.__optical_links = self.__descriptors.get('optical_links',[])
 
         if len(self.__ietf_slices) > 0:
             for slice_service in self.__ietf_slices["slice-service"]:
@@ -292,7 +287,6 @@ class DescriptorLoader:
     @property
     def num_connections(self) -> int: return len(self.__connections)
     
-    #------------- Experimental ---------------
     @property
     def optical_links(self) -> List[Dict]: return self.__optical_links
 
@@ -358,19 +352,17 @@ class DescriptorLoader:
         self.__svc_cli.connect()
         self.__slc_cli.connect()
 
-        self._process_descr('context',    'add',    self.__ctx_cli.SetContext,      Context,  self.__contexts_add  )
-        self._process_descr('topology',   'add',    self.__ctx_cli.SetTopology,     Topology, self.__topologies_add)
-        self._process_descr('controller', 'add',    self.__dev_cli.AddDevice,       Device,   controllers_add      )
-        self._process_descr('device',     'add',    self.__dev_cli.AddDevice,       Device,   network_devices_add  )
-        self._process_descr('device',     'config', self.__dev_cli.ConfigureDevice, Device,   self.__devices_config)
-        self._process_descr('link',       'add',    self.__ctx_cli.SetLink,         Link,     self.__links         )
-        self._process_descr('service',    'add',    self.__svc_cli.CreateService,   Service,  self.__services_add  )
-        self._process_descr('service',    'update', self.__svc_cli.UpdateService,   Service,  self.__services      )
-        self._process_descr('slice',      'add',    self.__slc_cli.CreateSlice,     Slice,    self.__slices_add    )
-        self._process_descr('slice',      'update', self.__slc_cli.UpdateSlice,     Slice,    self.__slices        )
-        
-        #----------------------------------- Experimental ---------------------------------------
-        self._process_descr('link',       'add',    self.__ctx_cli.SetOpticalLink,  OpticalLink, self.__optical_links)
+        self._process_descr('context',    'add',    self.__ctx_cli.SetContext,      Context,     self.__contexts_add  )
+        self._process_descr('topology',   'add',    self.__ctx_cli.SetTopology,     Topology,    self.__topologies_add)
+        self._process_descr('controller', 'add',    self.__dev_cli.AddDevice,       Device,      controllers_add      )
+        self._process_descr('device',     'add',    self.__dev_cli.AddDevice,       Device,      network_devices_add  )
+        self._process_descr('device',     'config', self.__dev_cli.ConfigureDevice, Device,      self.__devices_config)
+        self._process_descr('link',       'add',    self.__ctx_cli.SetLink,         Link,        self.__links         )
+        self._process_descr('service',    'add',    self.__svc_cli.CreateService,   Service,     self.__services_add  )
+        self._process_descr('service',    'update', self.__svc_cli.UpdateService,   Service,     self.__services      )
+        self._process_descr('slice',      'add',    self.__slc_cli.CreateSlice,     Slice,       self.__slices_add    )
+        self._process_descr('slice',      'update', self.__slc_cli.UpdateSlice,     Slice,       self.__slices        )
+        self._process_descr('link',       'add',    self.__ctx_cli.SetOpticalLink,  OpticalLink, self.__optical_links )
 
         # By default the Context component automatically assigns devices and links to topologies based on their
         # endpoints, and assigns topologies, services, and slices to contexts based on their identifiers.