Modification of VFC adapter code to make it SOL005 compliant

Change-Id: Ife06298197bed8c1e3766083c7bec39132610f84
Issue-ID: SO-1579
Signed-Off-by: Sambasiva K<sambasiva.kokkirala@verizon.com>

4 files changed, 271 insertions, 20 deletions

diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/aainfvoResponse.json b/adapters/mso-vfc-adapter/src/test/resources/json/aainfvoResponse.json
new file mode 100644
index 0000000000..35047a9c21
--- /dev/null
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/aainfvoResponse.json
@@ -0,0 +1,10 @@
+{
+  "nfvoId":"6ee79fe2-9579-475a-9bb9-20cf4358a19e",
+  "name":"external_nfvo",
+  "api-root":"xyz",
+  "vendor":"vz",
+  "version":"v1.0",
+  "url":"http://sample.com/",
+  "userName":"admin",
+  "password":"sacjnasnc"
+}
\ No newline at end of file
diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json b/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
index 047c81081e..aec8ae809d 100644
--- a/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/createNsReq.json
@@ -1,32 +1,56 @@
 {
-    "nsServiceName":"vIMS",
-    "nsServiceDescription":"vIMS NS",
+    "nsServiceName":"vcpe_e2e_vnf_test2",
+    "nsServiceDescription":"null",
+    "nsServiceModelUUID":"c9f0a95e-dea0-4698-96e5-5a79bc5a233d",
     "nsOperationKey":{
-        "globalSubscriberId":"9b9f02c0-298b-458a-bc9c-be3692e4f350",
-        "serviceType":"service",
-        "serviceId":"9b9f02c0-298b-458a-bc9c-be3692e4f351",
-        "operationId":"9b9f02c0-298b-458a-bc9c-be3692e4f352",
-        "nodeTemplateUUID":"9b9f02c0-298b-458a-bc9c-be3692e4f353"
+        "globalSubscriberId":"Demonstration",
+        "serviceType":"vCPE",
+        "serviceId":"996fadbb-e806-4a19-b0e5-3454ad6ac29e",
+        "operationId":"1f1dd6b2-b027-4008-a9df-3b6c8274fb24",
+        "nodeTemplateUUID":"4d3a835c-29c8-4a63-83a4-50de5f7ffe16"
     },
     "nsParameters":{
         "locationConstraints":[
             {
-                "vnfProfileId":"zte-CSCF-1.0",
                 "locationConstraints":{
-                    "vimId":"1"
-                }
+                    "vimId":"CloudOwner_regionOne"
+                },
+                "vnfProfileId":"b1bb0ce7-2222-4fa7-95ed-4840d70a1101"
+            },
+            {
+                "locationConstraints":{
+                    "vimId":"CloudOwner_regionOne"
+                },
+                "vnfProfileId":"0408f076-e6c0-4c82-9940-272fddbb82de"
+            },
+            {
+                "locationConstraints":{
+                    "vimId":"CloudOwner_regionOne"
+                },
+                "vnfProfileId":"b1bb0ce7-2222-4fa7-95ed-4840d70a1100"
+            },
+            {
+                "locationConstraints":{
+                    "vimId":"CloudOwner_regionOne"
+                },
+                "vnfProfileId":"b1bb0ce7-2222-4fa7-95ed-4840d70a1102"
+            },
+            {
+                "locationConstraints":{
+                    "vimId":"CloudOwner_regionOne"
+                },
+                "vnfProfileId":"3fca3543-07f5-492f-812c-ed462e4f94f4"
             }
         ],
         "additionalParamForNs":{
-            "externalDataNetworkName":"Flow_out_net",
-            "m6000_mng_ip":"192.168.20.2",
-            "externalCompanyFtpDataNetworkName":"Flow_out_net",
-            "externalPluginManageNetworkName":"plugin_net_2014",
-            "externalManageNetworkName":"mng_net_2017",
-            "sfc_data_network":"sfc_data_net_2016",
-            "NatIpRange":"210.1.1.10-210.1.1.20",
-            "location":"4050083f-465f-4838-af1e-47a545222ad0",
-            "sdncontroller":"9b9f02c0-298b-458a-bc9c-be3692e4f35e"
+            "orchestrator":"",
+            "nfvo":"b1bb0ce7-2222-4fa7-95ed-4840d70a1101",
+            "nf_naming":"true",
+            "multi_stage_design":"false",
+            "availability_zone_max_count":"1",
+            "xyz":"123",
+            "nsd0_providing_service_invariant_uuid":"12204a12-7da2-4ddf-8c2f-992a1a1acebf",
+            "nsd0_providing_service_uuid":"5791dbeb-19d4-43e8-bf44-5b327ccf6bca"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/createNsSol005Response.json b/adapters/mso-vfc-adapter/src/test/resources/json/createNsSol005Response.json
new file mode 100644
index 0000000000..938969a87f
--- /dev/null
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/createNsSol005Response.json
@@ -0,0 +1,210 @@
+{
+  "_links":{
+    "heal":{
+      "href":""
+    },
+    "instantiate":{
+      "href":""
+    },
+    "nestedNsInstances":{
+      "href":""
+    },
+    "scale":{
+      "href":""
+    },
+    "self":{
+      "href":""
+    },
+    "terminate":{
+      "href":""
+    },
+    "update":{
+      "href":""
+    }
+  },
+  "additionalAffinityOrAntiAffiniityRule":[
+    {
+      "Scope":"",
+      "affinityOrAntiAffiinty":"",
+      "vnfInstanceId":[
+
+      ],
+      "vnfProfileId":[
+
+      ],
+      "vnfdId":[
+
+      ]
+    }
+  ],
+  "flavourId":"",
+  "id":"c9f0a95e-dea0-4698-96e5-5a79bc5a233d",
+  "nestedNsInstanceId":[
+
+  ],
+  "nsInstanceDescription":"",
+  "nsInstanceName":"",
+  "nsScaleStatus":[
+    {
+      "nsScaleLevelId":"",
+      "nsScalingAspectId":""
+    }
+  ],
+  "nsState":"",
+  "nsdId":"",
+  "nsdInfoId":"",
+  "pnfInfo":[
+    {
+      "cpInfo":[
+        {
+          "cpInstanceId":"",
+          "cpProtocolData":{
+            "ipOverEthernet":{
+              "ipAddresses":{
+                "addressRange":{
+                  "maxAddress":"",
+                  "minAddress":""
+                },
+                "fixedAddresses":"",
+                "numDynamicAddresses":1,
+                "subnetId":"",
+                "type":""
+              },
+              "macAddress":{
+
+              }
+            },
+            "layerProtocol":"IP_OVER_ETHERNET"
+          },
+          "cpdId":""
+        }
+      ],
+      "pnfId":"",
+      "pnfName":"",
+      "pnfProfileId":"",
+      "pnfdId":"",
+      "pnfdInfoId":""
+    }
+  ],
+  "sapInfo":[
+    {
+      "description":"",
+      "id":"",
+      "sapName":"",
+      "sapProtocolInfo":{
+        "ipOverEthernet":{
+          "ipAddresses":{
+            "addressRange":{
+              "maxAddress":"",
+              "minAddress":""
+            },
+            "fixedAddresses":"",
+            "numDynamicAddresses":1,
+            "subnetId":"",
+            "type":""
+          },
+          "macAddress":""
+        },
+        "layerProtocol":"IP_OVER_ETHERNET"
+      },
+      "sapdId":""
+    }
+  ],
+  "virtualLinkInfo":[
+    {
+      "id":"",
+      "linkPort":[
+        {
+          "id":"",
+          "resourceHandle":{
+            "resourceId":"",
+            "resourceProviderId":"",
+            "vimId":"",
+            "vimLevelResourceType":""
+          }
+        }
+      ],
+      "nsVirtualLinkDescId":"",
+      "resourceHandle":[
+        {
+          "resourceId":"",
+          "resourceProviderId":"",
+          "vimId":"",
+          "vimLevelResourceType":""
+        }
+      ]
+    }
+  ],
+  "vnfInstance":[
+    {
+      "vnfInstanceId":"",
+      "vnfProfileId":""
+    }
+  ],
+  "vnffgInfo":[
+    {
+      "id":"",
+      "nfpInfo":[
+        {
+          "description":"",
+          "id":"",
+          "nfpName":"",
+          "nfpRule":{
+            "destinationIpAddressPrefix":"",
+            "destinationPortRange":"",
+            "dscp":"",
+            "etherDestinationAddress":"",
+            "etherSourceAddress":"",
+            "etherType":"",
+            "extendedCriteria":[
+              {
+                "length":1,
+                "startingPoint":1,
+                "value":""
+              }
+            ],
+            "protocol":"",
+            "sourceIpAddressPrefix":"",
+            "sourcePortRange":"",
+            "vlanTag":[
+
+            ]
+          },
+          "nfpState":"",
+          "nfpdId":"",
+          "nscpHandle":[
+            {
+              "nsInstanceId":"",
+              "nsSapInstanceId":"",
+              "pnfExtCpInstanceId":"",
+              "pnfInfoId":"",
+              "vnfExtCpInstanceId":"",
+              "vnfInstanceId":""
+            }
+          ],
+          "totalCp":1
+        }
+      ],
+      "nsCpHandle":[
+        {
+          "nsInstanceId":"",
+          "nsSapInstanceId":"",
+          "pnfExtCpInstanceId":"",
+          "pnfInfoId":"",
+          "vnfExtCpInstanceId":"",
+          "vnfInstanceId":""
+        }
+      ],
+      "nsVirtualLinkInfoId":[
+
+      ],
+      "pnfInfoId":[
+
+      ],
+      "vnfInstanceId":[
+
+      ],
+      "vnffgdId":""
+    }
+  ]
+}
\ No newline at end of file
diff --git a/adapters/mso-vfc-adapter/src/test/resources/json/lcmOperRsp.json b/adapters/mso-vfc-adapter/src/test/resources/json/lcmOperRsp.json
new file mode 100644
index 0000000000..111afc1a7c
--- /dev/null
+++ b/adapters/mso-vfc-adapter/src/test/resources/json/lcmOperRsp.json
@@ -0,0 +1,7 @@
+{
+  "id":"12204a12-7da2-4ddf-8c2f-992a1a1acebf",
+  "lcmOperationType":"INSTANTIATE",
+  "nsInstanceId":"c9f0a95e-dea0-4698-96e5-5a79bc5a233d",
+  "operationState":"PROCESSING",
+  "statusEnteredTime":"Time"
+}
\ No newline at end of file