CCVPN-usecase(REQ-719) requirements: update and revise CCVPN-NETWORK module to support latest

ccvpn profile. Also, correct the line separator to linux format, to resolve the docker compiling issue.

Issue-ID: USECASEUI-606
Signed-off-by: decheng zhang <decheng.zhang@huawei.com>
Change-Id: I97c0155fe64072fcd147737e72171b975dc3fa1b

1 files changed, 233 insertions, 34 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 967ec98b..a43c8c45 100644
--- a/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json
+++ b/usecaseui-portal/src/app/mock/json/uui-sotn_getConnectivityInfo.json
@@ -1,89 +1,288 @@
 {
   "connectivity": [
     {
-      "connectivity-id": "4424ea5a-3603-4040-baa9-4046ed533fe5",
-      "bandwidth-profile-name": "vpn1",
-      "vpn-type": "ethernet",
-      "color-aware": "true",
-      "coupling-flag": "true",
-      "etht-svc-name": "vpn1",
-      "access-provider-id": "",
-      "access-client-id": "",
-      "access-topology-id": "",
-      "access-node-id": "",
-      "access-ltp-id": "",
-      "connectivity-selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/32cd906f-ee7a-4ecf-b1c3-2fce4d59f8c0/service-data/networks/network/4424ea5a-3603-4040-baa9-4046ed533fe5/network-data/",
-      "operational-status": "Active",
-      "model-customization-id": "2bafc8aa-c60c-4a17-a658-db4cbca07fac",
-      "model-invariant-id": "5d0ada6b-de04-4624-9410-3baab839cd6f",
-      "model-version-id": "15e21930-3248-4148-b071-a2a9be1f9889",
-      "resource-version": "1537623789475",
+      "connectivity-id": "0cdb3c80-e319-4690-bed9-ae081e69542c",
+      "bandwidth-profile-name": "3",
+      "vpn-type": "leaf",
+      "cir": "3000000",
+      "eir": "3000000",
+      "coupling-flag": "-,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/",
+      "cvlan": "47",
+      "operational-status": "Activated",
+      "resource-version": "1632433788978",
       "relationship-list": {
         "relationship": [
           {
             "related-to": "vpn-binding",
-            "relationship-label": "org.onap.relationships.inventory.PartOf",
-            "related-link": "/aai/v13/network/vpn-bindings/vpn-binding/11.11.11.11-vpn1",
+            "relationship-label": "tosca.relationships.network.BindsTo",
+            "related-link": "/aai/v24/network/vpn-bindings/vpn-binding/7bdc2f8c-2d3f-4a9f-91c9-e13e105b3f85",
             "relationship-data": [
               {
                 "relationship-key": "vpn-binding.vpn-id",
-                "relationship-value": "11.11.11.11-vpn1"
+                "relationship-value": "7bdc2f8c-2d3f-4a9f-91c9-e13e105b3f85"
               }
             ],
             "related-to-property": [
               {
                 "property-key": "vpn-binding.vpn-name",
-                "property-value": "11.11.11.11-vpn1"
+                "property-value": "32edeb0d-1036-4f16-9c11-c5257d81ae0e"
               },
               {
-                "property-key": "vpn-binding.vpn-type",
-                "property-value": "ethernet"
+                "property-key": "vpn-binding.vpn-type"
               }
             ]
           },
           {
             "related-to": "service-instance",
             "relationship-label": "org.onap.relationships.inventory.PartOf",
-            "related-link": "/aai/v13/business/customers/customer/demo/service-subscriptions/service-subscription/ccvpn/service-instances/service-instance/32cd906f-ee7a-4ecf-b1c3-2fce4d59f8c0",
+            "related-link": "/aai/v24/business/customers/customer/IBNCustomer/service-subscriptions/service-subscription/IBN/service-instances/service-instance/cll-101",
             "relationship-data": [
               {
                 "relationship-key": "customer.global-customer-id",
-                "relationship-value": "demo"
+                "relationship-value": "IBNCustomer"
               },
               {
                 "relationship-key": "service-subscription.service-type",
-                "relationship-value": "ccvpn"
+                "relationship-value": "IBN"
               },
               {
                 "relationship-key": "service-instance.service-instance-id",
-                "relationship-value": "32cd906f-ee7a-4ecf-b1c3-2fce4d59f8c0"
+                "relationship-value": "cll-101"
               }
             ],
             "related-to-property": [
               {
                 "property-key": "service-instance.service-instance-name",
-                "property-value": "SOTNVPNInfra"
+                "property-value": "cloud-leased-line-101"
               }
             ]
           },
           {
-            "related-to": "vpn-binding",
+            "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": "connectivity",
+            "relationship-label": "tosca.relationships.network.LinksTo",
+            "related-link": "/aai/v24/network/connectivities/connectivity/c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+            "relationship-data": [
+              {
+                "relationship-key": "connectivity.connectivity-id",
+                "relationship-value": "c648ddff-7abe-44ba-946f-8d7a4fa2691b"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "connectivity.etht-svc-name",
+                "property-value": "cll-link-1"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "connectivity-id": "c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+      "bandwidth-profile-name": "3",
+      "vpn-type": "mdsc",
+      "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/",
+      "cvlan": "47",
+      "operational-status": "Created",
+      "resource-version": "1632433782443",
+      "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",
+            "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-101"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "service-instance.service-instance-name",
+                "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.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/v13/network/vpn-bindings/vpn-binding/12.12.12.12-vpn1",
+            "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": "connectivity",
+            "relationship-label": "tosca.relationships.network.LinksTo",
+            "related-link": "/aai/v24/network/connectivities/connectivity/0cdb3c80-e319-4690-bed9-ae081e69542c",
+            "relationship-data": [
+              {
+                "relationship-key": "connectivity.connectivity-id",
+                "relationship-value": "0cdb3c80-e319-4690-bed9-ae081e69542c"
+              }
+            ],
+            "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/8dfd5f6a-e795-47ff-8d66-ff26e78a7175",
+            "relationship-data": [
+              {
+                "relationship-key": "connectivity.connectivity-id",
+                "relationship-value": "8dfd5f6a-e795-47ff-8d66-ff26e78a7175"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "connectivity.etht-svc-name",
+                "property-value": "cll-link-1"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "connectivity-id": "8dfd5f6a-e795-47ff-8d66-ff26e78a7175",
+      "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=,",
+      "etht-svc-name": "cll-link-1",
+      "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/",
+      "cvlan": "47",
+      "operational-status": "Activated",
+      "resource-version": "1632433789733",
+      "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",
             "relationship-data": [
               {
                 "relationship-key": "vpn-binding.vpn-id",
-                "relationship-value": "12.12.12.12-vpn1"
+                "relationship-value": "c4b924e2-8a39-4f67-b9c1-d04b6c7a6053"
               }
             ],
             "related-to-property": [
               {
                 "property-key": "vpn-binding.vpn-name",
-                "property-value": "12.12.12.12-vpn1"
+                "property-value": "32edeb0d-1036-4f16-9c11-c5257d81ae0e"
+              },
+              {
+                "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",
+            "relationship-data": [
+              {
+                "relationship-key": "customer.global-customer-id",
+                "relationship-value": "IBNCustomer"
               },
               {
-                "property-key": "vpn-binding.vpn-type",
-                "property-value": "ethernet"
+                "relationship-key": "service-subscription.service-type",
+                "relationship-value": "IBN"
+              },
+              {
+                "relationship-key": "service-instance.service-instance-id",
+                "relationship-value": "cll-101"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "service-instance.service-instance-name",
+                "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": "connectivity",
+            "relationship-label": "tosca.relationships.network.LinksTo",
+            "related-link": "/aai/v24/network/connectivities/connectivity/c648ddff-7abe-44ba-946f-8d7a4fa2691b",
+            "relationship-data": [
+              {
+                "relationship-key": "connectivity.connectivity-id",
+                "relationship-value": "c648ddff-7abe-44ba-946f-8d7a4fa2691b"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "connectivity.etht-svc-name",
+                "property-value": "cll-link-1"
               }
             ]
           }