Commit a9977cbd authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/369-cttc-mwc26-f5g-simap-demo' into 'develop' 

Resolve "(CTTC) MWC26-F5G-SIMAP-Demo"

See merge request !425
parents 8622c047 f7cf9380

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ venv.bak/ 




# VSCode project settings

# VSCode project settings

.vscode/

.vscode/

.github/





# Visual Studio project settings

# Visual Studio project settings

/.vs

/.vs

manifests/simap_connectorservice.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ spec: 
              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # - ./src/tests/tools/simap_datastore/build.sh

              # - ./src/tests/tools/simap_datastore/build.sh

              # - ./src/tests/tools/simap_datastore/deploy.sh

              # - ./src/tests/tools/simap_datastore/deploy.sh

              value: "172.17.0.1"

              value: "10.254.0.9"

            - name: SIMAP_DATASTORE_PORT

            - name: SIMAP_DATASTORE_PORT

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # Assuming SIMAP Server is deployed in a local Docker container, as per:

              # - ./src/tests/tools/simap_datastore/build.sh

              # - ./src/tests/tools/simap_datastore/build.sh

src/common/tools/rest_conf/server/restconf_server/Callbacks.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ class _Callback: 
        @param old_data: Resource representation before retrieval, if applicable, otherwise `None`

        @param old_data: Resource representation before retrieval, if applicable, otherwise `None`

        @returns boolean indicating whether additional callbacks should be executed, defaults to False

        @returns boolean indicating whether additional callbacks should be executed, defaults to False

        '''

        '''

        MSG = 'match={:s}, path={:s}, old_data={:s}'

        MSG = 'match={}, path={}, old_data={}'

        msg = MSG.format(match.groupdict(), path, old_data)

        msg = MSG.format(match.groupdict(), path, old_data)

        raise NotImplementedError(msg)

        raise NotImplementedError(msg)
@@ -66,7 +66,7 @@ class _Callback: 
        @param new_data: Resource representation after change, if applicable, otherwise `None`

        @param new_data: Resource representation after change, if applicable, otherwise `None`

        @returns boolean indicating whether additional callbacks should be executed, defaults to False

        @returns boolean indicating whether additional callbacks should be executed, defaults to False

        '''

        '''

        MSG = 'match={:s}, path={:s}, old_data={:s}, new_data={:s}'

        MSG = 'match={}, path={}, old_data={}, new_data={}'

        msg = MSG.format(match.groupdict(), path, old_data, new_data)

        msg = MSG.format(match.groupdict(), path, old_data, new_data)

        raise NotImplementedError(msg)

        raise NotImplementedError(msg)
@@ -81,7 +81,7 @@ class _Callback: 
        @param input_data: Input data, if applicable, otherwise `None`

        @param input_data: Input data, if applicable, otherwise `None`

        @returns Optional[Dict] containing output data, defaults to None

        @returns Optional[Dict] containing output data, defaults to None

        '''

        '''

        MSG = 'match={:s}, path={:s}, input_data={:s}'

        MSG = 'match={}, path={}, input_data={:s}'

        msg = MSG.format(match.groupdict(), path, input_data)

        msg = MSG.format(match.groupdict(), path, input_data)

        raise NotImplementedError(msg)

        raise NotImplementedError(msg)

src/device/service/drivers/ietf_l3vpn/IetfL3VpnDriver.py

+1 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,7 @@ class IetfL3VpnDriver(_Driver): 
    def SetConfig(

    def SetConfig(

        self, resources : List[Tuple[str, Any]]

        self, resources : List[Tuple[str, Any]]

    ) -> List[Union[bool, Exception]]:

    ) -> List[Union[bool, Exception]]:

        LOGGER.info('SetConfig called with resources: {:s}'.format(str(resources)))

        results = []

        results = []

        if len(resources) == 0: return results

        if len(resources) == 0: return results

        with self.__lock:

        with self.__lock:

src/service/service/service_handlers/l3nm_ietfl3vpn/ConfigRules.py

+8 −8
Original line number Original line Diff line number Diff line
@@ -259,10 +259,10 @@ def setup_config_rules( 
            "/service[{:s}]/IETFL3VPN".format(service_uuid),

            "/service[{:s}]/IETFL3VPN".format(service_uuid),

            l3_vpn_data_model,

            l3_vpn_data_model,

        ),

        ),

        #json_config_rule_set(

        json_config_rule_set(

        #    "/service[{:s}]/IETFL3VPN/operation".format(service_uuid),

            "/service[{:s}]/IETFL3VPN/operation".format(service_uuid),

        #    {"type": operation_type},

            {"type": operation_type},

        #),

        ),

    ]

    ]





    return json_config_rules

    return json_config_rules
@@ -274,10 +274,10 @@ def teardown_config_rules(service_uuid: str) -> List[Dict]: 
            "/service[{:s}]/IETFL3VPN".format(service_uuid),

            "/service[{:s}]/IETFL3VPN".format(service_uuid),

            {"id": service_uuid},

            {"id": service_uuid},

        ),

        ),

        #json_config_rule_delete(

        json_config_rule_delete(

        #    "/service[{:s}]/IETFL3VPN/operation".format(service_uuid),

            "/service[{:s}]/IETFL3VPN/operation".format(service_uuid),

        #    {},

            {"type": "delete"},

        #),

        ),

    ]

    ]

    return json_config_rules

    return json_config_rules