Modify vfc-lcm variable name to hump

Change-Id: Ia42c7dd5f8d5bffb3413abfcab093c34477448c6
Issue-ID: VFC-528
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/docs/APIs/NSLCM_API/NSLCM_API_Specification_v0.1.rst b/docs/APIs/NSLCM_API/NSLCM_API_Specification_v0.1.rst
index 66df2f4..ff9e621 100644 (file)
--- a/docs/APIs/NSLCM_API/NSLCM_API_Specification_v0.1.rst
+++ b/docs/APIs/NSLCM_API/NSLCM_API_Specification_v0.1.rst
@@ -569,11 +569,11 @@ NS LCM API
          "context":{\r
             "type": "object",\r
             "properties": {\r
-              "global-customer-id":{\r
+              "globalCustomerId":{\r
                  "type": "string",\r
                  "description": "the global customer id"\r
               },\r
-              "service-type":{\r
+              "serviceType":{\r
                  "type": "string",\r
                  "description": "service type"\r
               }\r

diff --git a/lcm/ns/ns_create.py b/lcm/ns/ns_create.py
index c7f4a68..e18a926 100644 (file)
--- a/lcm/ns/ns_create.py
+++ b/lcm/ns/ns_create.py
@@ -32,8 +32,8 @@ class CreateNSService(object):
         self.csar_id = csar_id
         self.ns_name = ns_name
         self.description = description
-        self.global_customer_id = ignore_case_get(context, 'global-customer-id')
-        self.service_type = ignore_case_get(context, 'service-type')
+        self.global_customer_id = ignore_case_get(context, 'globalCustomerId')
+        self.service_type = ignore_case_get(context, 'serviceType')
         self.ns_inst_id = ''
         self.ns_package_id = ''
 

diff --git a/lcm/ns/ns_delete.py b/lcm/ns/ns_delete.py
index a4ecab3..131cb76 100644 (file)
--- a/lcm/ns/ns_delete.py
+++ b/lcm/ns/ns_delete.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
 import logging
 import traceback
 

diff --git a/lcm/ns/ns_heal.py b/lcm/ns/ns_heal.py
index d777191..3efa588 100644 (file)
--- a/lcm/ns/ns_heal.py
+++ b/lcm/ns/ns_heal.py
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import logging
 import threading
 import traceback

diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py
index 23c5ba3..b0994d2 100644 (file)
--- a/lcm/ns/ns_instant.py
+++ b/lcm/ns/ns_instant.py
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import json
 import logging
 import time

diff --git a/lcm/ns/ns_terminate.py b/lcm/ns/ns_terminate.py
index e2f1931..0e87e48 100644 (file)
--- a/lcm/ns/ns_terminate.py
+++ b/lcm/ns/ns_terminate.py
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import json
 import logging
 import math

diff --git a/lcm/ns/tests/test_ns_create.py b/lcm/ns/tests/test_ns_create.py
index 55397bb..e462e1c 100644 (file)
--- a/lcm/ns/tests/test_ns_create.py
+++ b/lcm/ns/tests/test_ns_create.py
@@ -46,8 +46,8 @@ class TestNsInstantiate(TestCase):
         mock_call_req.side_effect = [r1_query_nspackage_from_catalog, r2_create_ns_to_aai]
         data = {
             "context": {
-                "global-customer-id": "global-customer-id-test1",
-                "service-type": "service-type-test1"
+                "globalCustomerId": "global-customer-id-test1",
+                "serviceType": "service-type-test1"
             },
             "csarId": self.nsd_id,
             "nsName": "ns",

diff --git a/lcm/ns/views.py b/lcm/ns/views.py
index 4c403d1..03a5763 100644 (file)
--- a/lcm/ns/views.py
+++ b/lcm/ns/views.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
 import json
 import logging
 import os

diff --git a/lcm/swagger/vfc.nslcm.swagger.json b/lcm/swagger/vfc.nslcm.swagger.json
index 4b28cec..e8a8390 100644 (file)
--- a/lcm/swagger/vfc.nslcm.swagger.json
+++ b/lcm/swagger/vfc.nslcm.swagger.json
@@ -264,7 +264,7 @@
             }\r
           }\r
         }\r
-      },      \r
+      },\r
       "delete": {\r
         "tags": [\r
           "ns"\r
@@ -329,12 +329,12 @@
       "properties": {\r
         "context":{\r
           "type": "object",\r
-           "properties": {          \r
-              "global-customer-id":{\r
+           "properties": {\r
+              "globalCustomerId":{\r
                  "type": "string",\r
                  "description": "the global customer id"\r
               },\r
-              "service-type":{\r
+              "serviceType":{\r
                  "type": "string",\r
                  "description": "service type"\r
               }\r
@@ -605,7 +605,7 @@
             "jobId": {\r
                "type": "string"\r
              },\r
-            "responseDescriptor": \r
+            "responseDescriptor":\r
             {\r
                 "type":"object",\r
                 "properties": {\r