Update SO command from MSO

Update yaml from MSO to SO.

Change-Id: Ie73ea80cad8fb36988dc08b0ed8d138d1b02b657
Issue-ID: CLI-55
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

7 files changed, 48 insertions, 35 deletions

diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/service-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/service-create-schema-1.1.yaml
index 31fca411..96b7e036 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/service-create-schema-1.1.yaml
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/service-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-create
 description: Create a service instance using MSO
 version: onap-1.1
 service:
-  name: mso
+  name: so
   version: v3
   auth: basic
   mode: direct
@@ -12,7 +12,7 @@ parameters:
   - name: cloud-region
     description: cloud region identifier
     type: string
-    short_option: k
+    short_option: l
     long_option: cloud-region
     is_optional: false
   - name: tenant-id
@@ -66,6 +66,7 @@ parameters:
   - name: service-type
     description: subscription service type
     type: string
+    short_option: w
     long_option: service-type
     is_optional: false
 
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
index 42ba27ae..55aa0eb3 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/service-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-delete
 description: Delete service instance
 version: onap-1.1
 service:
-  name: mso
+  name: so
   version: v3
   auth: basic
   mode: direct
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
index 2c364d72..7b008e28 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-create
 description: Create a VF
 version: onap-1.1
 service:
-  name: mso
+  name: so
   version: v3
   auth: basic
   mode: direct
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
index b34d1b59..b41a872b 100644
--- 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
@@ -3,7 +3,7 @@ name: vf-delete
 description: delete a VF
 version: onap-1.1
 service:
-  name: mso
+  name: so
   version: v3
   auth: basic
   mode: direct
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-delete-schema-1.1.yaml
index 0ea7c321..848251be 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-delete-schema-1.1.yaml
+++ b/plugins/so/src/main/resources/onap-cli-schema/services/vf-module-delete-schema-1.1.yaml
@@ -1,50 +1,68 @@
 open_cli_schema_version: 1.0
-name: vf-module-delete
+name: vfmodule-delete
 description: delete a VF module
 version: onap-1.1
 service:
-  name: mso
-  version: v2
+  name: so
+  version: v3
   auth: basic
   mode: direct
 
 parameters:
-  - name: vnf-instance-id
-    description: id for vnf
+  - name: vfmodule-id
+    description: VF module Id
     type: string
     short_option: x
-    long_option: vnf-instace-id
+    long_option: vfmodule-id
     is_optional: false
-  - name: service-instance-id
-    description: unique id for service instance
+  - name: service-id
+    description: unique id for service
+    type: string
+    short_option: j
+    long_option: service-id
+    is_optional: false
+  - name: vf-id
+    description: unique id for related VF
     type: string
     short_option: y
-    long_option: service-instace-id
+    long_option: vf-id
+    is_optional: false
+  - name: vf-model-invariant-id
+    description: vf model invariant id
+    type: string
+    short_option: k
+    long_option: vf-model-invariant-id
     is_optional: false
-  - name: vf-module-id
-    description: vf module id
+  - name: vfmodule-name
+    description: vfmodule model name
     type: string
-    short_option: w
-    long_option: vf-module-id
+    short_option: e
+    long_option: vfmodule-name
     is_optional: false
-  - name: lcp-cloudregion-id
-    description: AIC LCP node location identifier
+  - name: vfmodule-version
+    description: vf module version
+    type: string
+    short_option: g
+    long_option: vfmodule-version
+    is_optional: false
+  - name: cloud-region
+    description: cloud region identifier
     type: string
     short_option: l
-    long_option: lcp-cloudregion-id
+    long_option: cloud-region
     is_optional: false
   - name: tenant-id
-    description: openstack tenant id (uuid)
+    description: openstack tenant id
     type: string
-    short_option: z
     long_option: tenant-id
+    short_option: z
     is_optional: false
 
 http:
   request:
-    uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules/${vf-module-id}
+    uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id}
     method: DELETE
-    body: '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff","modelName":"vSAMP12..base..module-0","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"${lcp-cloudregion-id}","tenantId":"${tenant-id}"},"requestInfo":{"source":"VID"}}}'
+    body: '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelInvariantId":"${vf-model-invariant-id}","modelName":"${vfmodule-name}","modelVersion":"${vfmodule-version}"},"cloudConfiguration":{"lcpCloudRegionId":"${cloud-region}","tenantId":"${tenant-id}"},"requestInfo":{"source":"VID"}}}'
 
   success_codes:
     - 202
\ No newline at end of file
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
index bb018b5b..52303e4e 100644
--- 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
@@ -3,7 +3,7 @@ name: vfmodule-create
 description: Create a VF module
 version: onap-1.1
 service:
-  name: mso
+  name: so
   version: v3
   auth: basic
   mode: direct
@@ -18,6 +18,7 @@ parameters:
   - name: tenant-id
     description: openstack tenant id
     type: string
+    short_option: B
     long_option: tenant-id
     is_optional: false
   - name: vfmodule-invariant-id
@@ -71,6 +72,7 @@ parameters:
   - name: vf-model-uuid
     description: model uuid for vf
     type: string
+    short_option: A
     long_option: vf-model-uuid
     is_optional: false
   - name: vf-model-name
@@ -86,7 +88,7 @@ parameters:
     long_option: vf-model-version
     is_optional: false
   - name: vf-model-customization-id
-    description: vf model customization id
+    description: vf model customization id. This can be obtained using SDC portal (Home -> service:xxx -> Composition -> click on VF for customization id).
     type: string
     short_option: q
     long_option: vf-model-customization-id
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-delete-sample-1.1.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-delete-sample-1.1.yaml
deleted file mode 100644
index 780e69d4..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-module-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vf-module-delete
-version: onap-1.1
-samples:
-    sample1:
-        name: delete a vf module
-        input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -s aca51b0a-710d-4155-bc7c-7cef19d9a94e -v aca45a67123-710d-4155-bc7c-7cef19d9a94e -m ccb52b09-710d-4155-bc7c-7cef19d9a94e -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e
\ No newline at end of file