diff options
Diffstat (limited to 'usecaseui-portal')
| -rw-r--r-- | usecaseui-portal/src/app/core/services/networkHttpservice.service.ts | 13 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json | 351 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getLogicalLinks.json | 390 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRouteInfo.json (renamed from usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRoutes.json) | 0 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getPnfInfo.json | 696 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getPnfs.json | 683 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindingInfo.json | 86 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindings.json | 40 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.html | 6 | ||||
| -rw-r--r-- | usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.ts | 108 |
10 files changed, 1099 insertions, 1274 deletions
diff --git a/usecaseui-portal/src/app/core/services/networkHttpservice.service.ts b/usecaseui-portal/src/app/core/services/networkHttpservice.service.ts index 0e16966a..77dbaffa 100644 --- a/usecaseui-portal/src/app/core/services/networkHttpservice.service.ts +++ b/usecaseui-portal/src/app/core/services/networkHttpservice.service.ts @@ -28,7 +28,7 @@ export class networkHttpservice { url = { "getNetworkD3Data": this.baseUrl+"/uui-sotn/getNetWorkResources", "getLogicalLinksData": this.baseUrl+"/uui-sotn/getLogicalLinks", - "getPnfsData": this.baseUrl+"/uui-sotn/getPnfs", + "getPnfsData": this.baseUrl+"/uui-sotn/getPnfInfo", "deleteCloud": this.baseUrl+"/uui-sotn/deleteExtNetWork", "getPInterfacesData": this.baseUrl+"/uui-sotn/getPinterfaceByPnfName/", "createLink": this.baseUrl+"/uui-sotn/createLink/", @@ -41,10 +41,9 @@ export class networkHttpservice { "createCloudLink": this.baseUrl+"/uui-sotn/createLink/", "createCloudUrl": this.baseUrl+"/uui-sotn/createHostUrl/", "deleteLink": this.baseUrl+"/uui-sotn/deleteLink/", - "getConnectivities": this.baseUrl+"/uui-sotn/getConnectivities", - "getNetworkRoutes": this.baseUrl + "/uui-sotn/getNetworkRoutes", - - + "getConnectivities": this.baseUrl+"/uui-sotn/getConnectivityInfo", + "getNetworkRoutes": this.baseUrl + "/uui-sotn/getNetworkRouteInfo", + "getVpnBindings": this.baseUrl + "/uui-sotn/getVpnBindingInfo" }; //The following APIs function are optimizable------------------------ @@ -93,6 +92,10 @@ export class networkHttpservice { return this.http.get<any>(this.url["getNetworkRoutes"]); } + getVpnBindingsData(){ + return this.http.get<any>(this.url["getVpnBindings"]); + } + //Create an external cloud newwork interface createNetwrok(paramsObj) { return this.http.put<any>(this.url["createNetwrok"] + paramsObj["network-id"], paramsObj); diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json index 49364170..b1dddffd 100644 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json +++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json @@ -1,68 +1,25 @@ { "connectivity": [ { - "connectivity-id": "4b92586f-d180-4512-a50e-a7501d4f2a60", + "connectivity-id": "39d524f7-8f9f-4019-8429-6626e906bb2b", "bandwidth-profile-name": "3", - "vpn-type": "leaf", + "vpn-type": "mdsc", "cir": "3000000", "eir": "3000000", - "coupling-flag": "-,OA==-,OA==", - "etht-svc-name": "cll-link-1", - "access-provider-id": "10", - "access-client-id": "0", - "access-topology-id": "2", - "access-node-id": "10.1.1.3", - "access-ltp-id": "1000001", - "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/", + "cbs": "", + "ebs": "", + "color-aware": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512-47", + "etht-svc-name": "cll-link-2", + "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cll-101/service-data/networks/network//network-data/", "cvlan": "47", - "operational-status": "Activated", - "resource-version": "1633101426107", + "operational-status": "Created", + "resource-version": "1651090024007", "relationship-list": { "relationship": [ { - "related-to": "vpn-binding", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/7f2713ed-c3dc-4595-bac0-9ab9bc2ae902", - "relationship-data": [ - { - "relationship-key": "vpn-binding.vpn-id", - "relationship-value": "7f2713ed-c3dc-4595-bac0-9ab9bc2ae902" - } - ], - "related-to-property": [ - { - "property-key": "vpn-binding.vpn-name", - "property-value": "0cf7325b-020d-4382-beff-d23f050a1679" - }, - { - "property-key": "vpn-binding.vpn-type" - } - ] - }, - { - "related-to": "vpn-binding", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/3742233f-bda7-45a5-b651-98efb930285d", - "relationship-data": [ - { - "relationship-key": "vpn-binding.vpn-id", - "relationship-value": "3742233f-bda7-45a5-b651-98efb930285d" - } - ], - "related-to-property": [ - { - "property-key": "vpn-binding.vpn-name", - "property-value": "ff99411f-2ca2-4b59-b199-f3d828a2d407" - }, - { - "property-key": "vpn-binding.vpn-type" - } - ] - }, - { "related-to": "service-instance", "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", + "related-link": "/aai/v21/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", "relationship-data": [ { "relationship-key": "customer.global-customer-id", @@ -83,92 +40,35 @@ "property-value": "cloud-leased-line-101" } ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-1000001", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-1000001" - } - ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3-ltpId-1000001", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3-ltpId-1000001" - } - ] - }, - { - "related-to": "service-instance", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-202", - "relationship-data": [ - { - "relationship-key": "customer.global-customer-id", - "relationship-value": "IBNCustomer" - }, - { - "relationship-key": "service-subscription.service-type", - "relationship-value": "IBN" - }, - { - "relationship-key": "service-instance.service-instance-id", - "relationship-value": "cll-202" - } - ], - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name", - "property-value": "cloud-leased-line-202" - } - ] - }, - { - "related-to": "connectivity", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/connectivities/connectivity/e97f233f-02ce-4e5f-a2ab-382f994719ce", - "relationship-data": [ - { - "relationship-key": "connectivity.connectivity-id", - "relationship-value": "e97f233f-02ce-4e5f-a2ab-382f994719ce" - } - ], - "related-to-property": [ - { - "property-key": "connectivity.etht-svc-name", - "property-value": "cll-link-1" - } - ] } ] } }, { - "connectivity-id": "e97f233f-02ce-4e5f-a2ab-382f994719ce", + "connectivity-id": "88531ca5-154c-4731-9adb-7ccc18935c34", "bandwidth-profile-name": "3", - "vpn-type": "mdsc", + "vpn-type": "leaf", "cir": "3000000", "eir": "3000000", - "color-aware": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512", - "etht-svc-name": "cll-link-1", - "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/", + "cbs": "", + "ebs": "", + "coupling-flag": "-,OA==", + "etht-svc-name": "cll-link-2", + "access-provider-id": "10", + "access-client-id": "0", + "access-topology-id": "2", + "access-node-id": "10.1.1.1", + "access-ltp-id": "1000001", + "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cll-101/service-data/networks/network//network-data/", "cvlan": "47", - "operational-status": "Created", - "resource-version": "1633101420677", + "operational-status": "Activated", + "resource-version": "1651090154981", "relationship-list": { "relationship": [ { "related-to": "service-instance", "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", + "related-link": "/aai/v21/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", "relationship-data": [ { "relationship-key": "customer.global-customer-id", @@ -189,166 +89,36 @@ "property-value": "cloud-leased-line-101" } ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-1000001", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-1000001" - } - ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3-ltpId-1000001", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3-ltpId-1000001" - } - ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512" - } - ] - }, - { - "related-to": "service-instance", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-202", - "relationship-data": [ - { - "relationship-key": "customer.global-customer-id", - "relationship-value": "IBNCustomer" - }, - { - "relationship-key": "service-subscription.service-type", - "relationship-value": "IBN" - }, - { - "relationship-key": "service-instance.service-instance-id", - "relationship-value": "cll-202" - } - ], - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name", - "property-value": "cloud-leased-line-202" - } - ] - }, - { - "related-to": "connectivity", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/connectivities/connectivity/4b92586f-d180-4512-a50e-a7501d4f2a60", - "relationship-data": [ - { - "relationship-key": "connectivity.connectivity-id", - "relationship-value": "4b92586f-d180-4512-a50e-a7501d4f2a60" - } - ], - "related-to-property": [ - { - "property-key": "connectivity.etht-svc-name", - "property-value": "cll-link-1" - } - ] - }, - { - "related-to": "connectivity", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/connectivities/connectivity/a3bc4be2-f2e5-408a-9517-43b94578a398", - "relationship-data": [ - { - "relationship-key": "connectivity.connectivity-id", - "relationship-value": "a3bc4be2-f2e5-408a-9517-43b94578a398" - } - ], - "related-to-property": [ - { - "property-key": "connectivity.etht-svc-name", - "property-value": "cll-link-1" - } - ] } ] } }, { - "connectivity-id": "a3bc4be2-f2e5-408a-9517-43b94578a398", + "connectivity-id": "28ef47d8-3d98-46bb-96c4-a51588d3700b", "bandwidth-profile-name": "3", "vpn-type": "root", "cir": "3000000", "eir": "3000000", - "color-aware": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512", - "coupling-flag": "-MTI=,-MTI=,", - "etht-svc-name": "cll-link-1", + "cbs": "", + "ebs": "", + "color-aware": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512-47", + "coupling-flag": "-MTI=,", + "etht-svc-name": "cll-link-2", "access-provider-id": "20", "access-client-id": "0", "access-topology-id": "2", "access-node-id": "10.2.1.2", "access-ltp-id": "512", - "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/", + "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cll-101/service-data/networks/network//network-data/", "cvlan": "47", "operational-status": "Activated", - "resource-version": "1633101427096", + "resource-version": "1651090155886", "relationship-list": { "relationship": [ { - "related-to": "vpn-binding", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/44addcac-8052-4ed8-b3c2-536e13f4d5ca", - "relationship-data": [ - { - "relationship-key": "vpn-binding.vpn-id", - "relationship-value": "44addcac-8052-4ed8-b3c2-536e13f4d5ca" - } - ], - "related-to-property": [ - { - "property-key": "vpn-binding.vpn-name", - "property-value": "0cf7325b-020d-4382-beff-d23f050a1679" - }, - { - "property-key": "vpn-binding.vpn-type" - } - ] - }, - { - "related-to": "vpn-binding", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/1ed58980-24b7-42e4-890b-399cbf5660cd", - "relationship-data": [ - { - "relationship-key": "vpn-binding.vpn-id", - "relationship-value": "1ed58980-24b7-42e4-890b-399cbf5660cd" - } - ], - "related-to-property": [ - { - "property-key": "vpn-binding.vpn-name", - "property-value": "ff99411f-2ca2-4b59-b199-f3d828a2d407" - }, - { - "property-key": "vpn-binding.vpn-type" - } - ] - }, - { "related-to": "service-instance", "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", + "related-link": "/aai/v21/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101", "relationship-data": [ { "relationship-key": "customer.global-customer-id", @@ -369,59 +139,6 @@ "property-value": "cloud-leased-line-101" } ] - }, - { - "related-to": "uni", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/network/unis/uni/networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512", - "relationship-data": [ - { - "relationship-key": "uni.id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512" - } - ] - }, - { - "related-to": "service-instance", - "relationship-label": "org.onap.relationships.inventory.PartOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-202", - "relationship-data": [ - { - "relationship-key": "customer.global-customer-id", - "relationship-value": "IBNCustomer" - }, - { - "relationship-key": "service-subscription.service-type", - "relationship-value": "IBN" - }, - { - "relationship-key": "service-instance.service-instance-id", - "relationship-value": "cll-202" - } - ], - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name", - "property-value": "cloud-leased-line-202" - } - ] - }, - { - "related-to": "connectivity", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/connectivities/connectivity/e97f233f-02ce-4e5f-a2ab-382f994719ce", - "relationship-data": [ - { - "relationship-key": "connectivity.connectivity-id", - "relationship-value": "e97f233f-02ce-4e5f-a2ab-382f994719ce" - } - ], - "related-to-property": [ - { - "property-key": "connectivity.etht-svc-name", - "property-value": "cll-link-1" - } - ] } ] } diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getLogicalLinks.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getLogicalLinks.json index c8150b51..8a5a0ee9 100644 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getLogicalLinks.json +++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getLogicalLinks.json @@ -1,17 +1,31 @@ { "logical-link": [ { - "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.1-6", + "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.3-1000001", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671508778", - "link-id": "10.1.1.1-6", + "resource-version": "1651079593767", + "link-id": "10.1.1.3-1000001" + }, + { + "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.1-2000001", + "in-maint": false, + "link-type": "point-to-point", + "resource-version": "1651079595335", + "link-id": "10.1.1.1-2000001" + }, + { + "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.3-22", + "in-maint": false, + "link-type": "point-to-point", + "resource-version": "1651079603849", + "link-id": "10.1.1.3-22", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -31,7 +45,7 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -52,25 +66,25 @@ } }, { - "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.2-5", + "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.1-12", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671575317", - "link-id": "10.2.1.2-5", + "resource-version": "1651079603586", + "link-id": "10.1.1.1-12", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2" } ], "related-to-property": [ @@ -82,15 +96,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12" } ], "related-to-property": [ @@ -106,34 +120,14 @@ "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.2-2", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671507090", + "resource-version": "1651079602734", "link-id": "10.1.1.2-2", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12", - "relationship-data": [ - { - "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" - }, - { - "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12" - } - ], - "related-to-property": [ - { - "property-key": "p-interface.prov-status" - } - ] - }, - { - "related-to": "p-interface", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -149,57 +143,19 @@ "property-key": "p-interface.prov-status" } ] - } - ] - } - }, - { - "link-name": "networkId-providerId-20-clientId-0-topologyId-2-linkId-10.2.1.2-512", - "in-maint": false, - "link-type": "point-to-point", - "resource-version": "1639671565616", - "link-id": "10.2.1.2-512" - }, - { - "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.3-22", - "in-maint": false, - "link-type": "point-to-point", - "resource-version": "1639671576216", - "link-id": "10.2.1.3-22", - "relationship-list": { - "relationship": [ - { - "related-to": "p-interface", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22", - "relationship-data": [ - { - "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" - }, - { - "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22" - } - ], - "related-to-property": [ - { - "property-key": "p-interface.prov-status" - } - ] }, { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12" } ], "related-to-property": [ @@ -215,7 +171,7 @@ "link-name": "1020", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671577231", + "resource-version": "1651079843099", "link-role": "cross-domain", "link-id": "10.1.1.2-12", "relationship-list": { @@ -223,7 +179,7 @@ { "related-to": "te-link-attribute", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/te-link-attributes/te-link-attribute/10.1.1.2-12", + "related-link": "/aai/v21/network/te-link-attributes/te-link-attribute/10.1.1.2-12", "relationship-data": [ { "relationship-key": "te-link-attribute.id", @@ -234,7 +190,7 @@ { "related-to": "te-link-attribute", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/te-link-attributes/te-link-attribute/10.2.1.1-22", + "related-link": "/aai/v21/network/te-link-attributes/te-link-attribute/10.2.1.1-22", "relationship-data": [ { "relationship-key": "te-link-attribute.id", @@ -245,7 +201,7 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -265,7 +221,7 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -286,25 +242,25 @@ } }, { - "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.3-12", + "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.2-22", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671507517", - "link-id": "10.1.1.3-12", + "resource-version": "1651079603012", + "link-id": "10.1.1.2-22", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12" } ], "related-to-property": [ @@ -316,15 +272,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22" } ], "related-to-property": [ @@ -337,25 +293,32 @@ } }, { - "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.3-22", + "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.1-1000001", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671507950", - "link-id": "10.1.1.3-22", + "resource-version": "1651079595034", + "link-id": "10.1.1.1-1000001" + }, + { + "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.2-22", + "in-maint": false, + "link-type": "point-to-point", + "resource-version": "1651079841054", + "link-id": "10.2.1.2-22", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22" } ], "related-to-property": [ @@ -367,15 +330,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12" } ], "related-to-property": [ @@ -388,32 +351,55 @@ } }, { - "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.1-1000001", + "link-name": "networkId-providerId-20-clientId-0-topologyId-2-linkId-10.2.1.2-512", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671497197", - "link-id": "10.1.1.1-1000001" + "resource-version": "1651079833721", + "link-id": "10.2.1.2-512" }, { - "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.3-3", + "link-name": "2010", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671575819", - "link-id": "10.2.1.3-3", + "resource-version": "1651079842503", + "link-role": "cross-domain", + "link-id": "10.1.1.3-8", "relationship-list": { "relationship": [ { + "related-to": "te-link-attribute", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v21/network/te-link-attributes/te-link-attribute/10.1.1.3-8", + "relationship-data": [ + { + "relationship-key": "te-link-attribute.id", + "relationship-value": "10.1.1.3-8" + } + ] + }, + { + "related-to": "te-link-attribute", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v21/network/te-link-attributes/te-link-attribute/10.2.1.3-12", + "relationship-data": [ + { + "relationship-key": "te-link-attribute.id", + "relationship-value": "10.2.1.3-12" + } + ] + }, + { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-8", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-8" } ], "related-to-property": [ @@ -425,15 +411,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-12" } ], "related-to-property": [ @@ -446,17 +432,24 @@ } }, { + "link-name": "networkId-providerId-20-clientId-0-topologyId-2-linkId-10.2.1.3-512", + "in-maint": false, + "link-type": "point-to-point", + "resource-version": "1651079833925", + "link-id": "10.2.1.3-512" + }, + { "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.1-9", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671573811", + "resource-version": "1651079840756", "link-id": "10.2.1.1-9", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -476,7 +469,7 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -497,25 +490,25 @@ } }, { - "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.1-12", + "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.1-6", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671576019", - "link-id": "10.2.1.1-12", + "resource-version": "1651079605281", + "link-id": "10.1.1.1-6", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-22" } ], "related-to-property": [ @@ -527,15 +520,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-6" } ], "related-to-property": [ @@ -548,25 +541,25 @@ } }, { - "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.1-12", + "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.3-22", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671507733", - "link-id": "10.1.1.1-12", + "resource-version": "1651079841940", + "link-id": "10.2.1.3-22", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ltpId-12" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-22" } ], "related-to-property": [ @@ -578,15 +571,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-2" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-9" } ], "related-to-property": [ @@ -599,18 +592,18 @@ } }, { - "link-name": "tranportEp_src_ID_111_2", + "link-name": "tranportEp_src_ID_111_1", "in-maint": false, "link-type": "TsciConnectionLink", - "resource-version": "1642347890612", + "resource-version": "1651090005720", "link-name2": "tranportEp_dst_ID_212_1", - "link-id": "cll-link-3", + "link-id": "cll-link-2", "relationship-list": { "relationship": [ { "related-to": "allotted-resource", "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101/allotted-resources/allotted-resource/cll-101-network-001", + "related-link": "/aai/v21/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101/allotted-resources/allotted-resource/cll-101-network-001", "relationship-data": [ { "relationship-key": "customer.global-customer-id", @@ -643,18 +636,18 @@ } }, { - "link-name": "tranportEp_src_ID_111_1", + "link-name": "tranportEp_src_ID_111_2", "in-maint": false, "link-type": "TsciConnectionLink", - "resource-version": "1642347890211", + "resource-version": "1651090005888", "link-name2": "tranportEp_dst_ID_212_1", - "link-id": "cll-link-2", + "link-id": "cll-link-3", "relationship-list": { "relationship": [ { "related-to": "allotted-resource", "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101/allotted-resources/allotted-resource/cll-101-network-001", + "related-link": "/aai/v21/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101/allotted-resources/allotted-resource/cll-101-network-001", "relationship-data": [ { "relationship-key": "customer.global-customer-id", @@ -687,39 +680,25 @@ } }, { - "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.3-1000001", - "in-maint": false, - "link-type": "point-to-point", - "resource-version": "1639671496767", - "link-id": "10.1.1.3-1000001" - }, - { - "link-name": "networkId-providerId-10-clientId-0-topologyId-2-linkId-10.1.1.1-2000001", - "in-maint": false, - "link-type": "point-to-point", - "resource-version": "1639671497411", - "link-id": "10.1.1.1-2000001" - }, - { - "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.2-22", + "link-name": "networkId-providerId-10-clientId-0-topologyId-1-linkId-10.1.1.3-12", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671507300", - "link-id": "10.1.1.2-22", + "resource-version": "1651079603278", + "link-id": "10.1.1.3-12", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12" } ], "related-to-property": [ @@ -731,15 +710,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-12" + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ltpId-22" } ], "related-to-property": [ @@ -752,48 +731,76 @@ } }, { - "link-name": "2010", + "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.2-5", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671576693", - "link-role": "cross-domain", - "link-id": "10.1.1.3-8", + "resource-version": "1651079841299", + "link-id": "10.2.1.2-5", "relationship-list": { "relationship": [ { - "related-to": "te-link-attribute", + "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/te-link-attributes/te-link-attribute/10.1.1.3-8", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3", "relationship-data": [ { - "relationship-key": "te-link-attribute.id", - "relationship-value": "10.1.1.3-8" + "relationship-key": "pnf.pnf-name", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" + }, + { + "relationship-key": "p-interface.interface-name", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3" + } + ], + "related-to-property": [ + { + "property-key": "p-interface.prov-status" } ] }, { - "related-to": "te-link-attribute", + "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/te-link-attributes/te-link-attribute/10.2.1.3-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5", "relationship-data": [ { - "relationship-key": "te-link-attribute.id", - "relationship-value": "10.2.1.3-12" + "relationship-key": "pnf.pnf-name", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" + }, + { + "relationship-key": "p-interface.interface-name", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5" + } + ], + "related-to-property": [ + { + "property-key": "p-interface.prov-status" } ] - }, + } + ] + } + }, + { + "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.3-3", + "in-maint": false, + "link-type": "point-to-point", + "resource-version": "1651079841516", + "link-id": "10.2.1.3-3", + "relationship-list": { + "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3/p-interfaces/p-interface/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-8", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ltpId-8" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-3" } ], "related-to-property": [ @@ -805,15 +812,15 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5", "relationship-data": [ { "relationship-key": "pnf.pnf-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2" }, { "relationship-key": "p-interface.interface-name", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ltpId-12" + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-5" } ], "related-to-property": [ @@ -826,24 +833,17 @@ } }, { - "link-name": "networkId-providerId-20-clientId-0-topologyId-2-linkId-10.2.1.3-512", - "in-maint": false, - "link-type": "point-to-point", - "resource-version": "1639671565814", - "link-id": "10.2.1.3-512" - }, - { - "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.2-22", + "link-name": "networkId-providerId-20-clientId-0-topologyId-1-linkId-10.2.1.1-12", "in-maint": false, "link-type": "point-to-point", - "resource-version": "1639671574613", - "link-id": "10.2.1.2-22", + "resource-version": "1651079841724", + "link-id": "10.2.1.1-12", "relationship-list": { "relationship": [ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ltpId-22", "relationship-data": [ { "relationship-key": "pnf.pnf-name", @@ -863,7 +863,7 @@ { "related-to": "p-interface", "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12", + "related-link": "/aai/v21/network/pnfs/pnf/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1/p-interfaces/p-interface/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ltpId-12", "relationship-data": [ { "relationship-key": "pnf.pnf-name", diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRoutes.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRouteInfo.json index 713a3add..713a3add 100644 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRoutes.json +++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getNetworkRouteInfo.json diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfInfo.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfInfo.json index c337bd97..1b8ad992 100644 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfInfo.json +++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfInfo.json @@ -1,29 +1,683 @@ { - "pnf-name": "pnf1000", - "pnf-id": "79.79.79.79", - "in-maint": true, - "resource-version": "1536028638695", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v13/network/network-resources/network-resource/1000", - "relationship-data": [ + "pnf": [ + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3", + "pnf-id": "10.1.1.3", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671501049", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ { - "relationship-key": "network-resource.network-id", - "relationship-value": "1000" + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MTI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MjI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MjI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-OA%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-OA==" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-1" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.3", + "pnf-id": "10.2.1.3", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671564529", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-2" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.1", + "pnf-id": "10.2.1.1", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671565455", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-2" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.2", + "pnf-id": "10.1.1.2", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671496572", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-2" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1", + "pnf-id": "10.2.1.1", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671573039", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MTI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MjI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MjI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-OQ%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-OQ==" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-1" + } + ] } - ], - "related-to-property": [ + ] + } + }, + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2", + "pnf-id": "10.1.1.2", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671506823", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-Mg%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-Mg==" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MTI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MjI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MjI=" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-1" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1", + "pnf-id": "10.1.1.1", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671496111", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-2" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1", + "pnf-id": "10.1.1.1", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671504733", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-Ng%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-Ng==" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-MTI=" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-1" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3", + "pnf-id": "10.1.1.3", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671495441", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc1" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-10-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-10-clientId-0-topologyId-2" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3", + "pnf-id": "10.2.1.3", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671568982", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MjI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MjI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-Mw%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-Mw==" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MTI=" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-1" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2", + "pnf-id": "10.2.1.2", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671567564", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-NQ%3D%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-NQ==" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MjI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MjI=" + } + ] + }, + { + "related-to": "tunnel-termination-point", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MTI%3D", + "relationship-data": [ + { + "relationship-key": "tunnel-termination-point.ttp-id", + "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MTI=" + } + ] + }, + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, + { + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-1" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-1" + } + ] + } + ] + } + }, + { + "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2", + "pnf-id": "10.2.1.2", + "in-maint": true, + "spare-equipment-indicator": false, + "resource-version": "1639671563430", + "admin-status": "up", + "operational-status": "up", + "relationship-list": { + "relationship": [ + { + "related-to": "esr-thirdparty-sdnc", + "relationship-label": "org.onap.relationships.inventory.AppliesTo", + "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", + "relationship-data": [ + { + "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", + "relationship-value": "sdnc2" + } + ] + }, { - "property-key": "network-resource.network-id", - "property-value": "1000" + "related-to": "network-resource", + "relationship-label": "tosca.relationships.network.LinksTo", + "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", + "relationship-data": [ + { + "relationship-key": "network-resource.network-id", + "relationship-value": "providerId-20-clientId-0-topologyId-2" + } + ], + "related-to-property": [ + { + "property-key": "network-resource.network-id", + "property-value": "providerId-20-clientId-0-topologyId-2" + } + ] } ] } - ] - } + } + ] }
\ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfs.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfs.json deleted file mode 100644 index 1b8ad992..00000000 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getPnfs.json +++ /dev/null @@ -1,683 +0,0 @@ -{ - "pnf": [ - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3", - "pnf-id": "10.1.1.3", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671501049", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MTI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MjI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-MjI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-OA%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.3-ttpId-OA==" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.3", - "pnf-id": "10.2.1.3", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671564529", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-2" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.1", - "pnf-id": "10.2.1.1", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671565455", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-2" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.2", - "pnf-id": "10.1.1.2", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671496572", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-2" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1", - "pnf-id": "10.2.1.1", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671573039", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MTI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MjI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-MjI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-OQ%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.1-ttpId-OQ==" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2", - "pnf-id": "10.1.1.2", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671506823", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-Mg%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-Mg==" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MTI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MjI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.2-ttpId-MjI=" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1", - "pnf-id": "10.1.1.1", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671496111", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-2" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1", - "pnf-id": "10.1.1.1", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671504733", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-Ng%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-Ng==" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1-ttpId-MTI=" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.3", - "pnf-id": "10.1.1.3", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671495441", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc1", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc1" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-10-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-10-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-10-clientId-0-topologyId-2" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3", - "pnf-id": "10.2.1.3", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671568982", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MjI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MjI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-Mw%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-Mw==" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.3-ttpId-MTI=" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2", - "pnf-id": "10.2.1.2", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671567564", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-NQ%3D%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-NQ==" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MjI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MjI=" - } - ] - }, - { - "related-to": "tunnel-termination-point", - "relationship-label": "tosca.relationships.network.BindsTo", - "related-link": "/aai/v24/network/tunnel-termination-points/tunnel-termination-point/networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MTI%3D", - "relationship-data": [ - { - "relationship-key": "tunnel-termination-point.ttp-id", - "relationship-value": "networkId-providerId-20-clientId-0-topologyId-1-nodeId-10.2.1.2-ttpId-MTI=" - } - ] - }, - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-1", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-1" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-1" - } - ] - } - ] - } - }, - { - "pnf-name": "networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2", - "pnf-id": "10.2.1.2", - "in-maint": true, - "spare-equipment-indicator": false, - "resource-version": "1639671563430", - "admin-status": "up", - "operational-status": "up", - "relationship-list": { - "relationship": [ - { - "related-to": "esr-thirdparty-sdnc", - "relationship-label": "org.onap.relationships.inventory.AppliesTo", - "related-link": "/aai/v24/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/sdnc2", - "relationship-data": [ - { - "relationship-key": "esr-thirdparty-sdnc.thirdparty-sdnc-id", - "relationship-value": "sdnc2" - } - ] - }, - { - "related-to": "network-resource", - "relationship-label": "tosca.relationships.network.LinksTo", - "related-link": "/aai/v24/network/network-resources/network-resource/providerId-20-clientId-0-topologyId-2", - "relationship-data": [ - { - "relationship-key": "network-resource.network-id", - "relationship-value": "providerId-20-clientId-0-topologyId-2" - } - ], - "related-to-property": [ - { - "property-key": "network-resource.network-id", - "property-value": "providerId-20-clientId-0-topologyId-2" - } - ] - } - ] - } - } - ] -}
\ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindingInfo.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindingInfo.json new file mode 100644 index 00000000..0071a089 --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindingInfo.json @@ -0,0 +1,86 @@ +{ + "vpn-binding": [ + { + "vpn-id": "c93dcdc9-fe9f-412c-bcf3-7d9a4151912e", + "vpn-name": "2c993a22-722f-4a5d-87e1-5b373362bc2c", + "vpn-platform": "rocks", + "vpn-region": "http://192.168.198.6:28181", + "customer-vpn-id": "20", + "route-distinguisher": "14", + "access-provider-id": "20", + "access-client-id": "0", + "access-topology-id": "1", + "src-access-node-id": "10.2.1.3", + "src-access-ltp-id": "MTI=", + "dst-access-node-id": "10.2.1.2", + "dst-access-ltp-id": "", + "operational-status": "Activated", + "slice-id": "cll-101", + "resource-version": "1651090153178", + "vpn-description": "onos", + "ops-note": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1", + "relationship-list": { + "relationship": [ + { + "related-to": "connectivity", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/connectivities/connectivity/28ef47d8-3d98-46bb-96c4-a51588d3700b", + "relationship-data": [ + { + "relationship-key": "connectivity.connectivity-id", + "relationship-value": "28ef47d8-3d98-46bb-96c4-a51588d3700b" + } + ], + "related-to-property": [ + { + "property-key": "connectivity.etht-svc-name", + "property-value": "cll-link-2" + } + ] + } + ] + } + }, + { + "vpn-id": "f825613f-6c9b-425d-9033-96bdb9e7ac88", + "vpn-name": "2c993a22-722f-4a5d-87e1-5b373362bc2c", + "vpn-platform": "rocks", + "vpn-region": "http://192.168.198.6:18181", + "customer-vpn-id": "20", + "route-distinguisher": "14", + "access-provider-id": "10", + "access-client-id": "0", + "access-topology-id": "1", + "src-access-node-id": "10.1.1.1", + "src-access-ltp-id": "", + "dst-access-node-id": "10.1.1.3", + "dst-access-ltp-id": "OA==", + "operational-status": "Activated", + "slice-id": "cll-101", + "resource-version": "1651090153697", + "vpn-description": "onos", + "ops-note": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1", + "relationship-list": { + "relationship": [ + { + "related-to": "connectivity", + "relationship-label": "tosca.relationships.network.BindsTo", + "related-link": "/aai/v24/network/connectivities/connectivity/88531ca5-154c-4731-9adb-7ccc18935c34", + "relationship-data": [ + { + "relationship-key": "connectivity.connectivity-id", + "relationship-value": "88531ca5-154c-4731-9adb-7ccc18935c34" + } + ], + "related-to-property": [ + { + "property-key": "connectivity.etht-svc-name", + "property-value": "cll-link-2" + } + ] + } + ] + } + } + ] +}
\ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindings.json b/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindings.json deleted file mode 100644 index c150d591..00000000 --- a/usecaseui-portal/src/app/mock/json/uui-sotn_getVpnBindings.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "vpn-binding": [ - { - "vpn-id": "f9097e3d-3578-44cf-a0cd-e41c36d6d2ad", - "vpn-name": "eb884038-da90-4c69-b35b-77af51e7ba72", - "vpn-platform": "rocks", - "vpn-region": "http://192.168.198.6:28181", - "customer-vpn-id": "4", - "route-distinguisher": "6", - "access-provider-id": "20", - "access-client-id": "0", - "access-topology-id": "1", - "src-access-node-id": "10.2.1.3", - "src-access-ltp-id": "MTI=", - "dst-access-node-id": "10.2.1.2", - "operational-status": "Activated", - "resource-version": "1642347908632", - "vpn-description": "onos", - "ops-note": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" - }, - { - "vpn-id": "56de3da0-bed1-4ecc-af22-39bc03c19dc0", - "vpn-name": "eb884038-da90-4c69-b35b-77af51e7ba72", - "vpn-platform": "rocks", - "vpn-region": "http://192.168.198.6:18181", - "customer-vpn-id": "4", - "route-distinguisher": "6", - "access-provider-id": "10", - "access-client-id": "0", - "access-topology-id": "1", - "src-access-node-id": "10.1.1.1", - "dst-access-node-id": "10.1.1.3", - "dst-access-ltp-id": "OA==", - "operational-status": "Activated", - "resource-version": "1642347908997", - "vpn-description": "onos", - "ops-note": "networkId-providerId-10-clientId-0-topologyId-1-nodeId-10.1.1.1" - } - ] -}
\ No newline at end of file diff --git a/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.html b/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.html index c9e150fa..edf36343 100644 --- a/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.html +++ b/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.html @@ -41,11 +41,11 @@ {{"i18nTextDefine_CCVPNService" | translate}} : </span> <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'"> - <button nz-button nz-dropdown><span>{{serviceSelected}}</span> <i class="anticon anticon-down"></i> + <button nz-button nz-dropdown><span>{{serviceSelected && servicesMap.get(serviceSelected).name}}</span> <i class="anticon anticon-down"></i> </button> <ul nz-menu> <li nz-menu-item (click)="chooseService(svcInstId)" *ngFor="let svcInstId of getKeys(servicesMap)"> - <a title="{{svcInstId}}">{{svcInstId}}</a> + <a title="{{servicesMap.get(svcInstId).name}}">{{servicesMap.get(svcInstId).name}}</a> </li> </ul> </nz-dropdown> @@ -87,6 +87,7 @@ > <thead> <tr> + <th>Ethernet Svc Name</th> <th>Service Instance Id</th> <th>Service Type</th> <th>VLAN</th> @@ -97,6 +98,7 @@ <tbody> <ng-template ngFor let-data [ngForOf]="basicTable.data" let-i="index"> <tr> + <td>{{ data.name }}</td> <td>{{ data.id }}</td> <td>Cloud Lease Line</td> <td>{{ data.vlan }}</td> diff --git a/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.ts b/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.ts index 6acdfa66..40b986bd 100644 --- a/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.ts +++ b/usecaseui-portal/src/app/views/network/ccvpn-network/ccvpn-network.component.ts @@ -25,7 +25,7 @@ const NODE_COLOR = 'DeepSkyBlue' const CE_COLOR = 'Gray' const FONT_COLOR = 'Navy' const TITLE_COLOR = '#0da9e2' //'linear-gradient(90deg, #07a9e1 0%, #30d9c4 100%)' - +const DEFAULT_COLOR= '#0000FF' // Customizable colors for endpoint CRUD status const EP_COLOR_MAP = new Map([ ['create', 'RoyalBlue'], @@ -194,7 +194,7 @@ export class CcvpnNetworkComponent implements OnInit { // Gets label from custom user object // TODO: this.graph.convertValueToString = function (cell) { - if (cell.isEdge() && !cell.value.uni && !this.isMoreLabels) return '' + if (cell.isEdge() && !cell.value.uni && !thisNg.isMoreLabels) return ''; return (cell.value && cell.value.label) ? cell.value.label : ''; } @@ -315,6 +315,23 @@ export class CcvpnNetworkComponent implements OnInit { }) reqCount++; + this.myhttp.getVpnBindingsData() + .subscribe((data) => { + if (data) { + for (let ll of data["vpn-binding"]) { + thisNg.vpnBindings.push(ll); + } + } + if (--reqCount == 0) { + thisNg.finishNetworkView(); + this.isSpinning = false; + } + }, + (err) => { + console.log(err); + }) + + reqCount++; this.myhttp.getConnectivities() .subscribe((data) => { if (data) { @@ -373,6 +390,7 @@ export class CcvpnNetworkComponent implements OnInit { pnfs = []; logicalLinks = [];//logicalLinks Existing connection data returned by the interface connectivities = []; + vpnBindings = []; networkroutes = []; layer1Tps = []; @@ -469,17 +487,22 @@ export class CcvpnNetworkComponent implements OnInit { // Update serive data for (let cn of this.connectivities){ if (cn['vpn-type'] === "mdsc"){ - let svcInstId = this.getValueFromRelationList(cn, "service-instance", "service-instance.service-instance-id"); + let svcInstId = this.getValueFromRelationList(cn, "service-instance", "service-instance.service-instance-id") + .pop(); + let svcInstName = cn["etht-svc-name"]; + let uniList = this.getValueFromRelationList(cn, "uni", "uni.id"); let bw = cn["bandwidth-profile-name"]; let cvlan = cn["cvlan"]; let svc = this.servicesMap.get(svcInstId); if (!svc){ svc = { - name: svcInstId, + name: svcInstName, id: svcInstId, connections: [], bw : bw, - vlan : cvlan + vlan : cvlan, + unis : uniList, + otnEdges: [] } this.servicesMap.set(svcInstId, svc); } @@ -552,7 +575,8 @@ export class CcvpnNetworkComponent implements OnInit { // tunnel connection link let srcEpId = this.getJsonValue(ll, "link-name"); let dstEpId = this.getJsonValue(ll, "link-name2"); - let svcInstId = this.getValueFromRelationList(ll, "allotted-resource", "service-instance.service-instance-id"); + let svcInstId = this.getValueFromRelationList(ll, "allotted-resource", "service-instance.service-instance-id") + .pop(); let conn = { srcEpId: srcEpId, dstEpId: dstEpId, @@ -626,6 +650,38 @@ export class CcvpnNetworkComponent implements OnInit { } } } + // Hack: deson't work for more then 2 domain system + for (let ll of thisNg.vpnBindings) { + let svcInstId = ll["slice-id"]; + let svc = this.servicesMap.get(svcInstId); + let srcNodeId = ll["src-access-node-id"]; + let dstNodeId = ll["dst-access-node-id"]; + let domainId = srcNodeId.split(".")[1]; + let domain = thisNg.domainMap.get(domainId); + if (!svc || !domain){ + continue; + } + for (let [, inni] of domain.inniMap){ + if (srcNodeId === inni.srcNode.id){ + if (dstNodeId === inni.dstNode.id){ + svc.otnEdges.push(inni); + } + } + if (dstNodeId === inni.srcNode.id){ + if (srcNodeId === inni.dstNode.id){ + svc.otnEdges.push(inni); + } + } + } + // For enni link + if (!ll["src-access-ltp-id"]){ + for (let [key, enni] of this.enniMap) { + if (dstNodeId === key.split("-")[0]){ + svc.otnEdges.push(enni); + }; + } + } + } } // main function that draws the topology view @@ -659,7 +715,8 @@ export class CcvpnNetworkComponent implements OnInit { inni.edge.value = { linkId: key, inni: inni, - domain: domain + domain: domain, + label: "" } //inni.srcNniTp.edge = inni.edge //inni.dstNniTp.edge = inni.edge @@ -777,7 +834,7 @@ export class CcvpnNetworkComponent implements OnInit { this.graph.setCellStyles(mxConstants.STYLE_FILLCOLOR, CE_COLOR, [uni.dstNode.vertex]) this.graph.setCellStyles(mxConstants.STYLE_DASHED, '1', [uni.edge]) uni.edge.value.label = '' - uni.edge.value.endPoint = null + uni.edge.value.endpoints = null } } @@ -796,7 +853,6 @@ export class CcvpnNetworkComponent implements OnInit { arr = dstUniLinkId.split('.'); uni = this.domainMap.get(arr[1]).uniMap.get(dstUniLinkId); colorUni(uni, this.graph, bw); - } } @@ -804,6 +860,25 @@ export class CcvpnNetworkComponent implements OnInit { for (let e2eTunnel of this.e2eTunnels) { e2eTunnel.e2eEdge.setVisible(e2eTunnel.serviceId === svcInstId) } + + // clear the label of all inni links + for (let [, svc] of this.servicesMap) { + for (let ed of service.otnEdges){ + this.graph.setCellStyles(mxConstants.STYLE_STROKECOLOR, DEFAULT_COLOR, [ed.edge]) + ed.edge.value.label = ''; + ed.edge.value.endpoints = null + } + } + // Update the label of inni links of current service + console.log(service); + if (service){ + let bw = service.bw; + for (let con of service.connections){ + for (let ed of service.otnEdges){ + colorOtnEdge(ed, this.graph, bw); + } + } + } this.graph.refresh(); // Utility func @@ -827,11 +902,22 @@ export class CcvpnNetworkComponent implements OnInit { let sum = uni.edge.value.endpoints.reduce((a, b) => a + b, 0); uni.edge.value.label = sum + 'G' ; } + function colorOtnEdge(ed, graph, bw){ + let bandwidth = parseInt(bw); + graph.setCellStyles(mxConstants.STYLE_STROKECOLOR, EP_COLOR_MAP.get("update"), [ed.edge]); + if (!ed.edge.value.endpoints) { + ed.edge.value.endpoints = []; + } + ed.edge.value.endpoints.push(bandwidth); + let sum = ed.edge.value.endpoints.reduce((a, b) => a + b, 0); + ed.edge.value.label = sum + 'G'; + } } getValueFromRelationList(rl, relatedTo, relatedKey){ let rlArr: Array<any> = this.getJsonValue(rl, 'relationship-list.relationship'); + let valList : Array<any> = []; for (let rl of rlArr){ if (rl['related-to'] === relatedTo){ let pnfNameS: String; @@ -839,12 +925,12 @@ export class CcvpnNetworkComponent implements OnInit { for (let rld of rl['relationship-data']){ if (rld['relationship-key'] === relatedKey){ let val = rld['relationship-value']; - if (val) return val; + if (val) valList.push(val); } } } } - return null; + return valList; } // get the key of an Endpoint getEndPointKey(endPoint) { |