Commit 9a1abcad authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 8b419b0b

deploy/all.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device  pathcomp opticalcontroller service slice nbi webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

lightpath.json

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
{

    "1": {

        "flow_id": 1,

        "src": "T1.1",

        "dst": "T2.1",

        "bitrate": 100,

        "bidir": 0,

        "flows": {

            "T1.1": {

                "f": {

                    "in": "0",

                    "out": "1"

                },

                "b": {}

            },

            "R1": {

                "f": {

                    "in": "12",

                    "out": "101"

                },

                "b": {}

            },

            "R2": {

                "f": {

                    "in": "111",

                    "out": "2"

                },

                "b": {}

            },

            "T2.1": {

                "f": {

                    "in": "6",

                    "out": "0"

                },

                "b": {}

            }

        },

        "band_type": "c_slots",

        "slots": [

            1,

            2,

            3,

            4

        ],

        "fiber_forward": {},

        "fiber_backward": {},

        "op-mode": 1,

        "n_slots": 4,

        "links": [

            "T1.1-R1",

            "R2-T2.1"

        ],

        "path": [

            "R1",

            "R2"

        ],

        "band": 50000,

        "freq": 192031250,

        "is_active": false,

        "parent_opt_band": 1,

        "new_optical_band": 1

    }

}
 
 No newline at end of file

src/device/service/drivers/oc_driver/OCDriver.py

+4 −4
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ from .templates.VPN.transponder import edit_optical_channel, change_optical_chan 
from .RetryDecorator import retry

from context.client.ContextClient import ContextClient

from common.proto.context_pb2 import OpticalConfig

from .templates.descovery_tool.transponders import  transponder_values_extractor

from .templates.descovery_tool.roadms import roadm_values_extractor, extract_media_channels

from .templates.descovery_tool.open_roadm import openroadm_values_extractor

from .templates.discovery_tool.transponders import  transponder_values_extractor

from .templates.discovery_tool.roadms import roadm_values_extractor, extract_media_channels

from .templates.discovery_tool.open_roadm import openroadm_values_extractor

from .templates.VPN.openroadm import network_media_channel_handler

src/device/service/drivers/oc_driver/templates/descovery_tool/open_roadm.py→src/device/service/drivers/oc_driver/templates/discovery_tool/open_roadm.py

+6 −16
Original line number Diff line number Diff line
@@ -19,15 +19,13 @@ import lxml.etree as ET 
from typing import Collection, Dict, Any

from common.proto.context_pb2 import  Location

from decimal import Decimal

def extract_roadm_circuits_pack (xml_data:str):

  



def extract_roadm_circuits_pack (xml_data:str):

    xml_bytes = xml_data.encode("utf-8")

    root = ET.fromstring(xml_bytes)

    # with open('xml.log', 'w') as f:

    #      print(xml_bytes, file=f)



    

    namespace = {'oc': "http://org/openroadm/device"}



    circuits = root.findall('.//oc:circuit-packs',namespace)
@@ -245,12 +243,4 @@ def openroadm_values_extractor (data_xml:str,resource_keys:list,dic:dict): 
                                    }

                    ports_result.append((resource_key, resource_value))



        

    return [dic,ports_result]            
    

    

    

    

    

    

              
 No newline at end of file