From 9709b1d7f11af4aadb6f68bd8a0665f93e574567 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 5 Feb 2021 11:36:13 +0100
Subject: [PATCH] fix issue #148 in v2.7.1
---
.../jsons/CreateNsRequest.json | 4 +--
.../jsons/InstantiateNsRequest.json | 6 ++--
.../jsons/ScaleNsRequest.json | 31 +---------------
.../jsons/UpdateNsRequest.json | 35 ++++++++++---------
4 files changed, 24 insertions(+), 52 deletions(-)
diff --git a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
index a8026a81..23670867 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/CreateNsRequest.json
@@ -1,6 +1,6 @@
-{{
+{
"nsdId": "{nsdId}",
"nsName": "{nsInstanceName}",
"vimAccountId": "{vimAccountId}",
"nsDescription": "{nsInstanceDescription}"
-}}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
index 5d0c060f..b89a44d1 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
@@ -1,5 +1,5 @@
-{{
- "nsFlavourId": "floavour_id",
+{
+ "nsFlavourId": "flavour_id",
"sapData":[
"{sapdId}"
],
@@ -10,4 +10,4 @@
"additionalParamsForNs":{},
"additionalParamForNestedNs":[],
"additionalParamsForVnf":[]
-}}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
index f9a87c85..12204fe2 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/ScaleNsRequest.json
@@ -1,32 +1,3 @@
{
- "description": "This type represents a request for the scale NS operation.\n",
- "type": "object",
- "required": [
- "scaleType"
- ],
- "properties": {
- "scaleType": {
- "description": "Indicates the type of scaling to be performed. Possible values: - SCALE_NS - SCALE_VNF\n",
- "type": "string",
- "enum": [
- "SCALE_NS",
- "SCALE_VNF"
- ]
- },
- "scaleNsData": {
- "description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_NS.\n",
- "$ref": "#/definitions/ScaleNsData"
- },
- "scaleVnfData": {
- "description": "The necessary information to scale the referenced NS instance. It shall be present when scaleType = SCALE_VNF.\n",
- "type": "array",
- "items": {
- "$ref": "#/definitions/ScaleVnfData"
- }
- },
- "scaleTime": {
- "description": "Timestamp indicating the scale time of the NS, i.e. the NS will be scaled at this timestamp. Cardinality \"0\" indicates the NS scaling takes place immediately\".\n",
- "$ref": "SOL005_def.yaml#/definitions/DateTime"
- }
- }
+ "scaleType": "SCALE_NS"
}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index da42b41c..4d344910 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -1,21 +1,22 @@
-{{
+{
"updateType": "{vnfUpdateType}",
- "instantiateVnfData": {{
+ "instantiateVnfData": {
"vnfdId": "{vnfdId}",
"vnfFlavourId": "{vnfFlavourId}",
- "vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
- "extManagedVirtualLinks": {{
+ "vnfInstantiationLevelId": "{vnfInstantiationLevelId}",
+ "extManagedVirtualLinks": {
"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"
- }},
- "changeVnfFlavourData": {{
- "vnfInstanceId": {},
- "newFlavourId": "{newFlavourId}",
- "instantiationLevelId": "{instantiationLevelId}"
- }},
- "assocNewNsdVersionData": {{
- "newNsdId": "{newNsdId}"
- }}
- "addSap": {{
- "sapdId": "{sapdId}"
- }}
-}}
\ No newline at end of file
+ },
+ "changeVnfFlavourData": {
+ "vnfInstanceId": {},
+ "newFlavourId": "{newFlavourId}",
+ "instantiationLevelId": "{instantiationLevelId}"
+ },
+ "assocNewNsdVersionData": {
+ "newNsdId": "{newNsdId}"
+ },
+ "addSap": {
+ "sapdId": "{sapdId}"
+ }
+ }
+}
--
GitLab