3 files changed, 61 insertions, 52 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/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/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