Commit 232fce7e authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into...

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/398-tid-nbi-for-ipowdm-with-device-driver-l3ietf
parents 804a769d 89a09e01
Loading
Loading
Loading
Loading
+54 −17
Original line number Diff line number Diff line
@@ -2,28 +2,65 @@
    "services": [
        {
            "service_id": {
                "context_id": {"context_uuid": {"uuid": "admin"}},
                "service_uuid": {"uuid": "IPoWDM"}
                "context_id": {
                    "context_uuid": {
                        "uuid": "admin"
                    }
                },
                "service_uuid": {
                    "uuid": "IPoWDM"
                }
            },
            "service_type": 12,
            "service_status": {"service_status": 1},
            "service_status": {
                "service_status": 1
            },
            "service_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "IP1"}},"endpoint_uuid": {"uuid": "PORT-xe4"}},
                {"device_id": {"device_uuid": {"uuid": "IP2"}},"endpoint_uuid": {"uuid": "PORT-xe4"}}
                {
                    "device_id": {
                        "device_uuid": {
                            "uuid": "IP1"
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "PORT-xe4"
                    }
                },
                {
                    "device_id": {
                        "device_uuid": {
                            "uuid": "IP2"
                        }
                    },
                    "endpoint_uuid": {
                        "uuid": "PORT-xe4"
                    }
                }
            ],
            "service_constraints": [],
            "service_config": {"config_rules": [
                {"action": 1, "ipowdm": {
            "service_config": {
                "config_rules": [
                    {
                        "action": 1,
                        "ipowdm": {
                            "endpoint_id": {
                        "device_id": {"device_uuid": {"uuid": "IP1"}},
                        "endpoint_uuid": {"uuid": "PORT-xe4"}
                                "device_id": {
                                    "device_uuid": {
                                        "uuid": "IP1"
                                    }
                                },
                                "endpoint_uuid": {
                                    "uuid": "PORT-xe4"
                                }
                            },
                            "rule_set": {
                                "src": [],
                                "dst": []
                            }
                }}
            ]}
                        }
                    }
                ]
            }
        }
    ]
}
 No newline at end of file
+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ from .ietf_l2vpn import register_ietf_l2vpn
from .ietf_l3vpn import register_ietf_l3vpn
from .ietf_network import register_ietf_network
from .ietf_network_slice import register_ietf_nss
from .ipowdm import register_ipowdm
from .optical_slice import register_optical_slice
from .ipowdm import register_ipowdm
from .osm_nbi import register_osm_api
@@ -110,6 +111,7 @@ register_telemetry_subscription(nbi_app)
register_tfs_api         (nbi_app)
#register_topology_updates(nbi_app) # does not work; check if eventlet-grpc side effects
register_vntm_recommend  (nbi_app)
register_ipowdm          (nbi_app)
register_media_channel   (nbi_app)
register_well_known      (nbi_app)
register_e2e_path_computation(nbi_app)
+347 −49

File changed.

Preview size limit exceeded, changes collapsed.

+34 −6

File changed.

Preview size limit exceeded, changes collapsed.