summaryrefslogtreecommitdiffstats
path: root/lcm/model/src
diff options
context:
space:
mode:
authorEnbo Wang <wangenbo@huawei.com>2020-01-07 16:32:30 +0800
committerEnbo Wang <wangenbo@huawei.com>2020-01-08 18:11:47 +0800
commit259dc1ff083206ea3a8425c8e9f3c6988d20e524 (patch)
treeb1648c543565fda2c583daf492056956a310dbfa /lcm/model/src
parenta5f02d8bfcc832d905b480942f61cde6ced57dac (diff)
Fix action names of DownloadNESw and ActivateNESw
Change-Id: I2a7b5ca9554e52f219afe9248d39732c485ab037 Issue-ID: SDNC-856 Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Diffstat (limited to 'lcm/model/src')
-rw-r--r--lcm/model/src/main/resources/lcm.20180329.json48
-rw-r--r--lcm/model/src/main/yang/lcm.yang12
2 files changed, 34 insertions, 26 deletions
diff --git a/lcm/model/src/main/resources/lcm.20180329.json b/lcm/model/src/main/resources/lcm.20180329.json
index 2e9eabe6f..18512fc35 100644
--- a/lcm/model/src/main/resources/lcm.20180329.json
+++ b/lcm/model/src/main/resources/lcm.20180329.json
@@ -1253,7 +1253,7 @@
"operationId": "upgrade-software"
}
},
- "/operations/LCM:download-ne-sw": {
+ "/operations/LCM:download-n-e-sw": {
"post": {
"consumes": [
"application/json",
@@ -1269,7 +1269,7 @@
"name": "body",
"required": false,
"schema": {
- "$ref": "#/definitions/(download-ne-sw)input-TOP"
+ "$ref": "#/definitions/(download-n-e-sw)input-TOP"
}
}
],
@@ -1277,15 +1277,15 @@
"200": {
"description": "No response was specified",
"schema": {
- "$ref": "#/definitions/(download-ne-sw)output-TOP"
+ "$ref": "#/definitions/(download-n-e-sw)output-TOP"
}
}
},
"description": "An operation to download NE software.",
- "operationId": "download-ne-sw"
+ "operationId": "download-n-e-sw"
}
},
- "/operations/LCM:activate-ne-sw": {
+ "/operations/LCM:activate-n-e-sw": {
"post": {
"consumes": [
"application/json",
@@ -1301,7 +1301,7 @@
"name": "body",
"required": false,
"schema": {
- "$ref": "#/definitions/(activate-ne-sw)input-TOP"
+ "$ref": "#/definitions/(activate-n-e-sw)input-TOP"
}
}
],
@@ -1309,12 +1309,12 @@
"200": {
"description": "No response was specified",
"schema": {
- "$ref": "#/definitions/(activate-ne-sw)output-TOP"
+ "$ref": "#/definitions/(activate-n-e-sw)output-TOP"
}
}
},
"description": "An operation to activate NE software.",
- "operationId": "activate-ne-sw"
+ "operationId": "activate-n-e-sw"
}
}
},
@@ -1627,6 +1627,10 @@
"vserver-id": {
"$ref": "#/definitions/Optional.empty",
"description": "identifies a specific VM within the given service/vnf to which\\n this action is to be applied"
+ },
+ "pnf-id": {
+ "$ref": "#/definitions/Optional.empty",
+ "description": "identifies the PNF to which this action is to be applied."
}
},
"type": "object"
@@ -4180,7 +4184,7 @@
},
"type": "object"
},
- "(download-ne-sw)input": {
+ "(download-n-e-sw)input": {
"properties": {
"LCM:action": {
"$ref": "#/definitions/Optional.empty"
@@ -4209,18 +4213,18 @@
],
"type": "object"
},
- "(download-ne-sw)input-TOP": {
+ "(download-n-e-sw)input-TOP": {
"properties": {
"LCM:input": {
"items": {
- "$ref": "#/definitions/(download-ne-sw)input"
+ "$ref": "#/definitions/(download-n-e-sw)input"
},
"type": "object"
}
},
"type": "object"
},
- "(download-ne-sw)output": {
+ "(download-n-e-sw)output": {
"properties": {
"LCM:common-header": {
"description": "A common header for all APP-C requests",
@@ -4245,18 +4249,18 @@
],
"type": "object"
},
- "(download-ne-sw)output-TOP": {
+ "(download-n-e-sw)output-TOP": {
"properties": {
"LCM:output": {
"items": {
- "$ref": "#/definitions/(download-ne-sw)output"
+ "$ref": "#/definitions/(download-n-e-sw)output"
},
"type": "object"
}
},
"type": "object"
},
- "(activate-ne-sw)input": {
+ "(activate-n-e-sw)input": {
"properties": {
"LCM:action": {
"$ref": "#/definitions/Optional.empty"
@@ -4285,18 +4289,18 @@
],
"type": "object"
},
- "(activate-ne-sw)input-TOP": {
+ "(activate-n-e-sw)input-TOP": {
"properties": {
"LCM:input": {
"items": {
- "$ref": "#/definitions/(activate-ne-sw)input"
+ "$ref": "#/definitions/(activate-n-e-sw)input"
},
"type": "object"
}
},
"type": "object"
},
- "(activate-ne-sw)output": {
+ "(activate-n-e-sw)output": {
"properties": {
"LCM:common-header": {
"description": "A common header for all APP-C requests",
@@ -4321,11 +4325,11 @@
],
"type": "object"
},
- "(activate-ne-sw)output-TOP": {
+ "(activate-n-e-sw)output-TOP": {
"properties": {
"LCM:output": {
"items": {
- "$ref": "#/definitions/(activate-ne-sw)output"
+ "$ref": "#/definitions/(activate-n-e-sw)output"
},
"type": "object"
}
@@ -4353,6 +4357,10 @@
"LCM:vserver-id": {
"$ref": "#/definitions/Optional.empty",
"description": "identifies a specific VM within the given service/vnf to which\\n this action is to be applied"
+ },
+ "LCM:pnf-id": {
+ "$ref": "#/definitions/Optional.empty",
+ "description": "identifies the PNF to which this action is to be applied."
}
},
"type": "object"
diff --git a/lcm/model/src/main/yang/lcm.yang b/lcm/model/src/main/yang/lcm.yang
index 55af1159d..d2ca5feb5 100644
--- a/lcm/model/src/main/yang/lcm.yang
+++ b/lcm/model/src/main/yang/lcm.yang
@@ -114,8 +114,8 @@ module LCM {
enum "DistributeTraffic";
enum "UpgradePreCheck";
enum "UpgradeSoftware";
- enum "DownloadNeSw";
- enum "ActivateNeSw";
+ enum "DownloadNESw";
+ enum "ActivateNESw";
enum "UpgradePostCheck";
enum "UpgradeBackup";
enum "UpgradeBackout";
@@ -600,9 +600,9 @@ module LCM {
}
/**********************************************************************************
- * Define the downloadNeSw operation
+ * Define the downloadNESw operation
**********************************************************************************/
- rpc download-ne-sw {
+ rpc download-n-e-sw {
description "An operation to download NE software";
input {
uses common-header;
@@ -627,9 +627,9 @@ module LCM {
}
/**********************************************************************************
- * Define the activateNeSw operation
+ * Define the activateNESw operation
**********************************************************************************/
- rpc activate-ne-sw {
+ rpc activate-n-e-sw {
description "An operation to activate NE software";
input {
uses common-header;