Display CCVPN network topology and tunnel installation.

Issue-ID: REQ-1103
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>
Change-Id: Ia8ad763ef8cdd48238c1398bd6680cc8ea2d14d6
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>

1 files changed, 159 insertions, 22 deletions

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 a43c8c45..49364170 100644
--- a/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json
+++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json
@@ -1,12 +1,12 @@
 {
   "connectivity": [
     {
-      "connectivity-id": "0cdb3c80-e319-4690-bed9-ae081e69542c",
+      "connectivity-id": "4b92586f-d180-4512-a50e-a7501d4f2a60",
       "bandwidth-profile-name": "3",
       "vpn-type": "leaf",
       "cir": "3000000",
       "eir": "3000000",
-      "coupling-flag": "-,OA==",
+      "coupling-flag": "-,OA==-,OA==",
       "etht-svc-name": "cll-link-1",
       "access-provider-id": "10",
       "access-client-id": "0",
@@ -16,23 +16,43 @@
       "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/",
       "cvlan": "47",
       "operational-status": "Activated",
-      "resource-version": "1632433788978",
+      "resource-version": "1633101426107",
       "relationship-list": {
         "relationship": [
           {
             "related-to": "vpn-binding",
             "relationship-label": "tosca.relationships.network.BindsTo",
-            "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/7bdc2f8c-2d3f-4a9f-91c9-e13e105b3f85",
+            "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/7f2713ed-c3dc-4595-bac0-9ab9bc2ae902",
             "relationship-data": [
               {
                 "relationship-key": "vpn-binding.vpn-id",
-                "relationship-value": "7bdc2f8c-2d3f-4a9f-91c9-e13e105b3f85"
+                "relationship-value": "7f2713ed-c3dc-4595-bac0-9ab9bc2ae902"
               }
             ],
             "related-to-property": [
               {
                 "property-key": "vpn-binding.vpn-name",
-                "property-value": "32edeb0d-1036-4f16-9c11-c5257d81ae0e"
+                "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"
@@ -67,6 +87,17 @@
           {
             "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": [
               {
@@ -76,13 +107,38 @@
             ]
           },
           {
+            "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/c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+            "related-link": "/aai/v24/network/connectivities/connectivity/e97f233f-02ce-4e5f-a2ab-382f994719ce",
             "relationship-data": [
               {
                 "relationship-key": "connectivity.connectivity-id",
-                "relationship-value": "c648ddff-7abe-44ba-946f-8d7a4fa2691b"
+                "relationship-value": "e97f233f-02ce-4e5f-a2ab-382f994719ce"
               }
             ],
             "related-to-property": [
@@ -96,7 +152,7 @@
       }
     },
     {
-      "connectivity-id": "c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+      "connectivity-id": "e97f233f-02ce-4e5f-a2ab-382f994719ce",
       "bandwidth-profile-name": "3",
       "vpn-type": "mdsc",
       "cir": "3000000",
@@ -106,7 +162,7 @@
       "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/",
       "cvlan": "47",
       "operational-status": "Created",
-      "resource-version": "1632433782443",
+      "resource-version": "1633101420677",
       "relationship-list": {
         "relationship": [
           {
@@ -137,6 +193,17 @@
           {
             "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": [
               {
@@ -157,13 +224,38 @@
             ]
           },
           {
+            "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/0cdb3c80-e319-4690-bed9-ae081e69542c",
+            "related-link": "/aai/v24/network/connectivities/connectivity/4b92586f-d180-4512-a50e-a7501d4f2a60",
             "relationship-data": [
               {
                 "relationship-key": "connectivity.connectivity-id",
-                "relationship-value": "0cdb3c80-e319-4690-bed9-ae081e69542c"
+                "relationship-value": "4b92586f-d180-4512-a50e-a7501d4f2a60"
               }
             ],
             "related-to-property": [
@@ -176,11 +268,11 @@
           {
             "related-to": "connectivity",
             "relationship-label": "tosca.relationships.network.LinksTo",
-            "related-link": "/aai/v24/network/connectivities/connectivity/8dfd5f6a-e795-47ff-8d66-ff26e78a7175",
+            "related-link": "/aai/v24/network/connectivities/connectivity/a3bc4be2-f2e5-408a-9517-43b94578a398",
             "relationship-data": [
               {
                 "relationship-key": "connectivity.connectivity-id",
-                "relationship-value": "8dfd5f6a-e795-47ff-8d66-ff26e78a7175"
+                "relationship-value": "a3bc4be2-f2e5-408a-9517-43b94578a398"
               }
             ],
             "related-to-property": [
@@ -194,13 +286,13 @@
       }
     },
     {
-      "connectivity-id": "8dfd5f6a-e795-47ff-8d66-ff26e78a7175",
+      "connectivity-id": "a3bc4be2-f2e5-408a-9517-43b94578a398",
       "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=,",
+      "coupling-flag": "-MTI=,-MTI=,",
       "etht-svc-name": "cll-link-1",
       "access-provider-id": "20",
       "access-client-id": "0",
@@ -210,23 +302,43 @@
       "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service//service-data/networks/network//network-data/",
       "cvlan": "47",
       "operational-status": "Activated",
-      "resource-version": "1632433789733",
+      "resource-version": "1633101427096",
       "relationship-list": {
         "relationship": [
           {
             "related-to": "vpn-binding",
             "relationship-label": "tosca.relationships.network.BindsTo",
-            "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/c4b924e2-8a39-4f67-b9c1-d04b6c7a6053",
+            "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/44addcac-8052-4ed8-b3c2-536e13f4d5ca",
             "relationship-data": [
               {
                 "relationship-key": "vpn-binding.vpn-id",
-                "relationship-value": "c4b924e2-8a39-4f67-b9c1-d04b6c7a6053"
+                "relationship-value": "44addcac-8052-4ed8-b3c2-536e13f4d5ca"
               }
             ],
             "related-to-property": [
               {
                 "property-key": "vpn-binding.vpn-name",
-                "property-value": "32edeb0d-1036-4f16-9c11-c5257d81ae0e"
+                "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"
@@ -270,13 +382,38 @@
             ]
           },
           {
+            "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/c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+            "related-link": "/aai/v24/network/connectivities/connectivity/e97f233f-02ce-4e5f-a2ab-382f994719ce",
             "relationship-data": [
               {
                 "relationship-key": "connectivity.connectivity-id",
-                "relationship-value": "c648ddff-7abe-44ba-946f-8d7a4fa2691b"
+                "relationship-value": "e97f233f-02ce-4e5f-a2ab-382f994719ce"
               }
             ],
             "related-to-property": [