summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2017-10-31 12:10:10 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-31 12:10:10 +0000
commitfdbe1212765e7ebc1693f8e7dd171c42d0388b9b (patch)
tree36b3702a71f45f35116a4195dde4dd06a252c423 /plugins
parent4a43f8d59d02ddc7adce651b6bbc36d6bac59e7f (diff)
parent94ce7f14e9321d9bc461eaac9257d00a3f344f7b (diff)
Merge changes I94f2bbf6,I176aeb0b
* changes: Fix command for vfmodule-create Create command for vnf-delete
Diffstat (limited to 'plugins')
-rw-r--r--plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml61
-rw-r--r--plugins/so/src/main/resources/onap-cli-schema/services/vf-module-create-schema-1.1.yaml74
-rw-r--r--plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml125
-rw-r--r--plugins/so/src/main/resources/onap-cli-schema/services/vnf-delete-schema-1.1.yaml44
-rw-r--r--plugins/so/src/test/resources/onap-cli-sample/services/vf-module-create-sample-1.1.yaml8
-rw-r--r--plugins/so/src/test/resources/onap-cli-sample/services/vnf-delete-sample-1.1.yaml8
6 files changed, 186 insertions, 134 deletions
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml
new file mode 100644
index 00000000..51609cc5
--- /dev/null
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml
@@ -0,0 +1,61 @@
+open_cli_schema_version: 1.0
+name: vf-delete
+description: delete a VF
+version: onap-1.1
+service:
+ name: mso
+ version: v3
+ auth: basic
+ mode: direct
+parameters:
+- name: vf-id
+ description: id for vnf
+ type: string
+ short_option: x
+ long_option: vf-id
+ is_optional: false
+- name: service-instance-id
+ description: unique id for service instance
+ type: string
+ short_option: y
+ long_option: service-instance-id
+ is_optional: false
+- name: cloud-region
+ description: Cloud region ID
+ type: string
+ short_option: l
+ long_option: cloud-region
+ is_optional: false
+- name: tenant-id
+ description: openstack tenant id (uuid)
+ type: string
+ short_option: z
+ long_option: tenant-id
+ is_optional: false
+- name: model-invariant-id
+ description: model invariant id for service in SDC catalog
+ type: string
+ long_option: model-invariant-id
+ is_optional: false
+- name: model-uuid
+ description: model uuid for service in SDC catalog
+ type: string
+ long_option: model-uuid
+ is_optional: false
+- name: model-name
+ description: model name available in SDC catalog
+ type: string
+ long_option: model-name
+ is_optional: false
+- name: model-version
+ description: model version of service (eg. 1.0)
+ type: string
+ long_option: model-version
+ is_optional: false
+http:
+ request:
+ uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs/${vf-id}
+ method: DELETE
+ body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId":"${model-invariant-id}","modelVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion":"${model-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId":"${tenant-id}"},"requestInfo": {"source": "VID"},"requestParameters": {"userParams":[]}}}'
+ success_codes:
+ - 202 \ No newline at end of file
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-create-schema-1.1.yaml
deleted file mode 100644
index 170ba845..00000000
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-create-schema-1.1.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-open_cli_schema_version: 1.0
-name: vf-module-create
-description: Create a VF Module
-version: onap-1.1
-service:
- name: mso
- version: v2
- auth: basic
- mode: direct
-
-parameters:
- - name: lcp-cloudregion-id
- description: AIC LCP node location identifier
- type: string
- short_option: l
- long_option: lcp-cloudregion-id
- is_optional: false
- - name: tenant-id
- description: openstack tenant id (uuid)
- type: string
- short_option: w
- long_option: tenant-id
- is_optional: false
- - name: vnf-instance-id
- description: vnf instance id
- type: string
- short_option: y
- long_option: vnf-instace-id
- is_optional: false
- - name: service-instance-id
- description: unique id for service instance
- type: string
- short_option: x
- long_option: service-instace-id
- is_optional: false
- - name: parenet-service-model
- description: parent service model name
- type: string
- short_option: z
- long_option: parenet-service-model
- is_optional: false
- - name: supress-rollback
- description: rollback changes if instantiation fails.
- type: bool
- short_option: r
- long_option: supress-rollback
- is_optional: true
- - name: instance-name
- description: service instance name
- type: string
- short_option: i
- long_option: instance-name
- is_optional: false
-
-results:
- direction: portrait
- attribute:
- - name: vf-instance-id
- description: id for the created vf
- type: string
- scope: short
-
-http:
- request:
- uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules
- method: PUT
- body: '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12..base..module-0","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"${lcp-cloudregion-id}","tenantId":"${tenant-id}"},"requestInfo":{"instanceName":"${instance-name}","source":"VID","suppressRollback":"${supress-rollback}"},"relatedInstanceList":[{"relatedInstance":{"instanceId":"${service-instance-id}","modelInfo":{"modelType":"service","modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"${parenet-service-model}","modelVersion":"1.0"}}},{"relatedInstance":{"instanceId":"${vnf-instance-id}","modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12","modelVersion":"1.0","modelCustomizationName":"vSAMP12 1"}}}],"requestParameters":{"userParams":[]}}}'
-
- success_codes:
- - 202
- result_mpa:
- vf-instance-id: $b{$.vfInstanceId}
- sample_response:
- body: '{"vfInstanceId":"234567AB"}'
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml
new file mode 100644
index 00000000..74127e92
--- /dev/null
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml
@@ -0,0 +1,125 @@
+open_cli_schema_version: 1.0
+name: vfmodule-create
+description: Create a VF module
+version: onap-1.1
+service:
+ name: mso
+ version: v3
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: cloud-region
+ description: cloud region identifier
+ type: string
+ short_option: l
+ long_option: cloud-region
+ is_optional: false
+ - name: tenant-id
+ description: openstack tenant id
+ type: string
+ short_option: z
+ long_option: tenant-id
+ is_optional: false
+ - name: vfmodule-invariant-id
+ description: vfmodule model invariant id
+ type: string
+ long_option: vfmodule-invariant-id
+ is_optional: false
+ - name: vfmodule-uuid
+ description: model uuid for vfmodule
+ type: string
+ long_option: vfmodule-uuid
+ is_optional: false
+ - name: vfmodule-name
+ description: vfmodule model name
+ type: string
+ long_option: vfmodule-name
+ is_optional: false
+ - name: vfmodule-version
+ description: vf module version
+ type: string
+ long_option: vfmodule-version
+ is_optional: false
+ - name: module-name
+ description: vfmodule name
+ type: string
+ short_option: i
+ long_option: module-name
+ is_optional: false
+ - name: service-id
+ description: unique id for service
+ type: string
+ long_option: service-id
+ is_optional: false
+ - name: vf-id
+ description: unique id for related VF
+ type: string
+ short_option: y
+ long_option: vf-id
+ is_optional: false
+ - name: vf-model-invariant-id
+ description: vf model invariant id
+ type: string
+ long_option: vf-model-invariant-id
+ is_optional: false
+ - name: vf-model-uuid
+ description: model uuid for vf
+ type: string
+ long_option: vf-model-uuid
+ is_optional: false
+ - name: vf-model-name
+ description: vf model name
+ type: string
+ long_option: vf-model-name
+ is_optional: false
+ - name: vf-model-version
+ description: vf model version
+ type: string
+ long_option: vf-model-version
+ is_optional: false
+ - name: vf-model-customization-id
+ description: vf model customization id
+ type: string
+ long_option: vf-model-customization-id
+ is_optional: false
+ - name: service-model-invariant-id
+ description: model invariant id
+ type: string
+ long_option: service-model-invariant-id
+ is_optional: false
+ - name: service-model-uuid
+ description: model name version id
+ type: string
+ long_option: service-model-uuid
+ is_optional: false
+ - name: service-model-name
+ description: service model name
+ type: string
+ long_option: service-model-name
+ is_optional: false
+ - name: service-model-version
+ description: service model version
+ type: string
+ long_option: service-model-version
+ is_optional: false
+
+
+results:
+ direction: portrait
+ attributes:
+ - name: vfmodule-id
+ description: id for the created vnf
+ type: string
+ scope: short
+
+http:
+ request:
+ uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules
+ method: POST
+ body: '{"requestDetails": {"modelInfo": {"modelType": "vfModule","modelInvariantId": "${vfmodule-invariant-id}","modelNameVersionId": "${vfmodule-uuid}","modelName": "${vfmodule-name}","modelVersion": "${vfmodule-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${module-name}","source": "VID"},"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelNameVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}},{"relatedInstance": {"instanceId": "${vf-id}","modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelNameVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationName": "${vf-model-customization-id}"}}}],"requestParameters": {"userParams": []}}}'
+
+ success_codes:
+ - 202
+ result_map:
+ vfmodule-id: $b{$.requestReferences.instanceId}
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vnf-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vnf-delete-schema-1.1.yaml
deleted file mode 100644
index 08134f88..00000000
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vnf-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-open_cli_schema_version: 1.0
-name: vnf-delete
-description: delete a VNF
-version: onap-1.1
-service:
- name: mso
- version: v2
- auth: basic
- mode: direct
-
-parameters:
- - name: vnf-instance-id
- description: id for vnf
- type: string
- short_option: x
- long_option: vnf-instace-id
- is_optional: false
- - name: service-instance-id
- description: unique id for service instance
- type: string
- short_option: y
- long_option: service-instace-id
- is_optional: false
- - name: lcp-cloudregion-id
- description: AIC LCP node location identifier
- type: string
- short_option: l
- long_option: lcp-cloudregion-id
- is_optional: false
- - name: tenant-id
- description: openstack tenant id (uuid)
- type: string
- short_option: z
- long_option: tenant-id
- is_optional: false
-
-http:
- request:
- uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs
- method: DELETE
- body: '{"requestDetails":{"modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelName":"vSAMP12","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"mdt1","tenantId":"88a6ca3ee0394ade9403f075db23167e"},"requestInfo":{"source":"VID"},"requestParameters":{"userParams":[]}}}'
-
- success_codes:
- - 202 \ No newline at end of file
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-create-sample-1.1.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-create-sample-1.1.yaml
deleted file mode 100644
index b19bc54d..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vf-module-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a vnf
- input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -v b123-45565678da -s a445678-24da -m a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -r -i instance \ No newline at end of file
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vnf-delete-sample-1.1.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/vnf-delete-sample-1.1.yaml
deleted file mode 100644
index bc3e89fb..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vnf-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnf-delete
-version: onap-1.1
-samples:
- sample1:
- name: delete a vnf
- input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -v aca51b0a-710d-4155-bc7c-7cef19d9a94e -s ff305d54-75b4-431b-adb2-eb6b9e5ff000 -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e \ No newline at end of file