From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Fri, 2 Mar 2018 07:08:47 +0000 (+0800)
Subject: Add code to deal with scaling json
X-Git-Tag: v1.1.0~108
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F33741%2F1;p=vfc%2Fnfvo%2Flcm.git

Add code to deal with scaling json

Change-Id: I203065c621dab33c5c61b946c85e22b6ede48d77
Issue-ID: VFC-784
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---

diff --git a/lcm/ns/data/scalemapping.json b/lcm/ns/data/scalemapping.json
index 410332c9..59ebc73d 100644
--- a/lcm/ns/data/scalemapping.json
+++ b/lcm/ns/data/scalemapping.json
@@ -1,19 +1,19 @@
 {
     "scale_options": [
         {
-            "ns_instanceId":"23",
+            "nsd_id":"23",
             "ns_scale_aspect": "TIC_EDGE_IMS",
             "ns_scale_info_list": [
                 {
                     "step": "1",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_zte_cscf",
+                            "vnfd_id":"nf_zte_cscf",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         },
                         {
-                            "vnfInstanceId":"nf_zte_hss",
+                            "vnfd_id":"nf_zte_hss",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         }
@@ -23,12 +23,12 @@
                     "step": "2",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_zte_cscf",
+                            "vnfd_id":"nf_zte_cscf",
                             "vnf_scaleAspectId": "mpu",
                             "numberOfSteps": "1"
                         },
                         {
-                            "vnfInstanceId":"nf_zte_hss",
+                            "vnfd_id":"nf_zte_hss",
                             "vnf_scaleAspectId": "mpu",
                             "numberOfSteps": "1"
                         }
@@ -37,19 +37,19 @@
             ]
         },
         {
-            "ns_instanceId":"23",
+            "nsd_id":"23",
             "ns_scale_aspect": "TIC_EDGE_HW",
             "ns_scale_info_list": [
                 {
                     "step": "4",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_hw_cscf",
+                            "vnfd_id":"nf_hw_cscf",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         },
                         {
-                            "vnfInstanceId":"nf_hw_hss",
+                            "vnfd_id":"nf_hw_hss",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         }
@@ -59,12 +59,12 @@
                     "step": "6",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_HW_cscf",
+                            "vnfd_id":"nf_HW_cscf",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         },
                         {
-                            "vnfInstanceId":"nf_HW_hss",
+                            "vnfd_id":"nf_HW_hss",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         }
@@ -73,19 +73,19 @@
             ]
         },
         {
-            "ns_instanceId":"235",
+            "nsd_id":"235",
             "ns_scale_aspect": "TIC_EDGE_HW",
             "ns_scale_info_list": [
                 {
                     "step": "4",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_hw_cscf",
+                            "vnfd_id":"nf_hw_cscf",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "123"
                         },
                         {
-                            "vnfInstanceId":"nf_hw_hss",
+                            "vnfd_id":"nf_hw_hss",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "456"
                         }
@@ -95,12 +95,12 @@
                     "step": "6",
                     "vnf_scale_list":[
                         {
-                            "vnfInstanceId":"nf_HW_cscf",
+                            "vnfd_id":"nf_HW_cscf",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         },
                         {
-                            "vnfInstanceId":"nf_HW_hss",
+                            "vnfd_id":"nf_HW_hss",
                             "vnf_scaleAspectId": "gpu",
                             "numberOfSteps": "1"
                         }