From 32cabc9b0f505bc6275e78fbd676d067310dd8b5 Mon Sep 17 00:00:00 2001 From: "ying.yunlong" Date: Thu, 12 Oct 2017 10:53:24 +0800 Subject: [PATCH] Modify vfc-lcm variable name to hump Change-Id: Ia42c7dd5f8d5bffb3413abfcab093c34477448c6 Issue-ID: VFC-528 Signed-off-by: ying.yunlong --- docs/APIs/NSLCM_API/NSLCM_API_Specification_v0.1.rst | 4 ++-- lcm/ns/ns_create.py | 4 ++-- lcm/ns/ns_delete.py | 2 -- lcm/ns/ns_heal.py | 1 - lcm/ns/ns_instant.py | 1 - lcm/ns/ns_terminate.py | 1 - lcm/ns/tests/test_ns_create.py | 4 ++-- lcm/ns/views.py | 2 -- lcm/swagger/vfc.nslcm.swagger.json | 10 +++++----- 9 files changed, 11 insertions(+), 18 deletions(-) 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 66df2f41..ff9e621a 100644 --- 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":{ "type": "object", "properties": { - "global-customer-id":{ + "globalCustomerId":{ "type": "string", "description": "the global customer id" }, - "service-type":{ + "serviceType":{ "type": "string", "description": "service type" } diff --git a/lcm/ns/ns_create.py b/lcm/ns/ns_create.py index c7f4a684..e18a9269 100644 --- 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 a4ecab36..131cb76a 100644 --- 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 d777191c..3efa5884 100644 --- 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 23c5ba37..b0994d28 100644 --- 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 e2f19312..0e87e489 100644 --- 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 55397bb1..e462e1c3 100644 --- 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 4c403d16..03a5763d 100644 --- 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 4b28cec9..e8a83905 100644 --- a/lcm/swagger/vfc.nslcm.swagger.json +++ b/lcm/swagger/vfc.nslcm.swagger.json @@ -264,7 +264,7 @@ } } } - }, + }, "delete": { "tags": [ "ns" @@ -329,12 +329,12 @@ "properties": { "context":{ "type": "object", - "properties": { - "global-customer-id":{ + "properties": { + "globalCustomerId":{ "type": "string", "description": "the global customer id" }, - "service-type":{ + "serviceType":{ "type": "string", "description": "service type" } @@ -605,7 +605,7 @@ "jobId": { "type": "string" }, - "responseDescriptor": + "responseDescriptor": { "type":"object", "properties": { -- 2.16.6