Seperate Create Opticalband Msgs

src/device/service/OpenConfigServicer.py

@@ -86,9 +86,10 @@ class OpenConfigServicer(DeviceServiceServicer):
             device = get_device(
                 context_client, device_uuid, rw_copy=True, include_endpoints=True, include_components=False,
                 include_config_rules=False)
-            LOGGER.info(f"device is {device}")        
+           
             if device is None:
                 raise NotFoundException('Device', device_uuid, extra_details='loading in ConfigureDevice')
+            LOGGER.info(f"device is {device.name}")       
             resources,conditions=extract_resources(config=config,device=device)
             LOGGER.info(f"from openconfigservicer {resources} and conditions {conditions}")
             driver : _Driver = get_driver(self.driver_instance_cache, device)
@@ -169,9 +170,10 @@ class OpenConfigServicer(DeviceServiceServicer):
             device = get_device(
                 context_client, device_uuid, rw_copy=True, include_endpoints=True, include_components=False,
                 include_config_rules=False)
-            LOGGER.info(f"device is {device}")        
+          
             if device is None:
                 raise NotFoundException('Device', device_uuid, extra_details='loading in ConfigureDevice')
+            LOGGER.info(f"device is {device.name}")        
             resources,conditions=extract_resources(config=config,device=device)
             LOGGER.info(f" Disable resources from openconfigservicer {resources} and conditions {conditions}")
             driver : _Driver = get_driver(self.driver_instance_cache, device)

src/device/service/drivers/oc_driver/templates/VPN/roadms.py

@@ -240,47 +240,48 @@ def create_optical_band (resources) :
     unwanted_keys=['destination_port','source_port','channel_namespace','frequency','optical-band-parent','handled_flow']
     config,ports,index= filter_config(resources,unwanted_keys=unwanted_keys)
     logging.info(f"SSSSSSSSSSSSSSS {ports}")
-    doc, tag, text = Doc().tagtext()
     #with tag('config'):
-    with tag('config',xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"):
-      with tag('wavelength-router', xmlns="http://openconfig.net/yang/wavelength-router"):
-        with tag('optical-bands',xmlns="http://flex-scale-project.eu/yang/flex-scale-mg-on"):
-            n = 0
-          
-            for flow in ports:
-                #with tag('optical-band', operation="create"):
-                src,dest=flow
-                logging.info(f"SSSSSSSSSSSSSSS {src}, {dest}")
-                with tag('optical-band'):
-                    if index is not None:
-                        with tag('index'):text(str(int(index)+n))
-                    with tag('config'):
-                        #if index is not None:
-                        #    with tag('index'):text(str(int(index)+i))
-                        for resource in config:       
-                            if resource['resource_key'] == "index":
+    n = 0
+    for flow in ports:
+        doc, tag, text = Doc().tagtext()
+        with tag('config',xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"):
+            with tag('wavelength-router', xmlns="http://openconfig.net/yang/wavelength-router"):
+                with tag('optical-bands',xmlns="http://flex-scale-project.eu/yang/flex-scale-mg-on"):
+                   
+                
+                        #with tag('optical-band', operation="create"):
+                        src,dest=flow
+                        logging.info(f"SSSSSSSSSSSSSSS {src}, {dest}")
+                        with tag('optical-band'):
+                            if index is not None:
                                 with tag('index'):text(str(int(index)+n))
-                            else:
-                                with tag(resource['resource_key']):text(resource['value'])
-                        with tag('admin-status'):text('ENABLED')       
-                        #with tag('fiber-parent'):text(ports['destination_port'] if 'destination_port' in ports else ports['source_port'])       
-                    if dest is not None and dest != '0':        
-                        with tag('dest'):
                             with tag('config'):
-                                with tag('port-name'):text(dest)
-                    if src is not None and src !='0':        
-                        with tag('source'):
-                            with tag('config'):  
-                                with tag('port-name'):text(src)   
-                n +=1                
-                            
+                                #if index is not None:
+                                #    with tag('index'):text(str(int(index)+i))
+                                for resource in config:       
+                                    if resource['resource_key'] == "index":
+                                        with tag('index'):text(str(int(index)+n))
+                                    else:
+                                        with tag(resource['resource_key']):text(resource['value'])
+                                with tag('admin-status'):text('ENABLED')       
+                                #with tag('fiber-parent'):text(ports['destination_port'] if 'destination_port' in ports else ports['source_port'])       
+                            if dest is not None and dest != '0':        
+                                with tag('dest'):
+                                    with tag('config'):
+                                        with tag('port-name'):text(dest)
+                            if src is not None and src !='0':        
+                                with tag('source'):
+                                    with tag('config'):  
+                                        with tag('port-name'):text(src)   
+        n +=1                
                                 
-    result = indent(
-                doc.getvalue(),
-                indentation = ' '*2,
-                newline = ''
-            )
-    results.append(result)
+                                
+        result = indent(
+                    doc.getvalue(),
+                    indentation = ' '*2,
+                    newline = ''
+                )
+        results.append(result)
     return results