Merge "Add sort option for MSO cmd"

6 files changed, 47 insertions, 3 deletions

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
index bdc77563..4ce83d4b 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml
@@ -24,39 +24,46 @@ parameters:
   - name: vsp-category
     description: Category of the VSP
     type: string
+    short_option: b
     long_option: vsp-category
     is_optional: true
     default_value: resourceNewCategory.generic
   - name: vsp-subcategory
     description: Sub Category of VSP
     type: string
+    short_option: c
     long_option: vsp-subcategory
     is_optional: true
     default_value: resourceNewCategory.generic.abstract
   - name: vlm-version
     description: License version
     type: string
+    short_option: e
     long_option: vlm-version
     is_optional: true
     default_value: 1.0
   - name: vlm-vendor
     description: License Model Name
     type: string
+    short_option: g
     long_option: vlm-vendor
     is_optional: false
   - name: vlm-id
     description: License Model ID
     type: string
+    short_option: i
     long_option: vlm-id
     is_optional: false
   - name: vlm-agreement-id
     description: License Agreement ID
     type: string
+    short_option: j
     long_option: vlm-agreement-id
     is_optional: false
   - name: vlm-feature-group-id
     description: Feature Group ID
     type: string
+    short_option: k
     long_option: vlm-feature-group-id
     is_optional: false
 results:
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 a4593644..31fca411 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
@@ -12,31 +12,37 @@ parameters:
   - name: cloud-region
     description: cloud region identifier
     type: string
+    short_option: k
     long_option: cloud-region
     is_optional: false
   - name: tenant-id
     description: tenant id
     type: string
+    short_option: b
     long_option: tenant-id
     is_optional: false
   - name: model-invariant-id
     description: model invariant id generated by ASDC.
     type: string
+    short_option: e
     long_option: model-invariant-id
     is_optional: false
   - name: model-uuid
     description: model uuid generated by ASDC.
     type: string
+    short_option: g
     long_option: model-uuid
     is_optional: false
   - name: model-name
     description: model name as provided in ASDC design time.
     type: string
+    short_option: i
     long_option: model-name
     is_optional: false
   - name: model-version
     description: model-version
     type: string
+    short_option: j
     long_option: model-version
     is_optional: false
   - name: customer
@@ -48,7 +54,7 @@ parameters:
   - name: instance-name
     description: service instance name
     type: string
-    short_option: i
+    short_option: k
     long_option: instance-name
     is_optional: false
   - name: supress-rollback
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 4c6e4a92..42ba27ae 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
@@ -18,21 +18,25 @@ parameters:
   - name: model-invariant-id
     description: model invariant id for service in SDC catalog
     type: string
+    short_option: b
     long_option: model-invariant-id
     is_optional: false
   - name: model-uuid
     description: model uuid for service in SDC catalog
     type: string
+    short_option: i
     long_option: model-uuid
     is_optional: false
   - name: model-name
     description: model name available in SDC catalog
     type: string
+    short_option: e
     long_option: model-name
     is_optional: false
   - name: model-version
     description: model version of service (eg. 1.0)
     type: string
+    short_option: g
     long_option: model-version
     is_optional: false
   - name: customer-name
@@ -44,11 +48,13 @@ parameters:
   - name: cloud-region
     description: cloud region id
     type: string
+    short_option: j
     long_option: cloud-region
     is_optional: false
   - name: tenant-id
     description: tenant id
     type: string
+    short_option: k
     long_option: tenant-id
     is_optional: false
 
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 8b1d4af7..2c364d72 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
@@ -30,7 +30,7 @@ parameters:
   - name: instance-name
     description: service instance name
     type: string
-    short_option: i
+    short_option: o
     long_option: instance-name
     is_optional: false
   - name: service-instance-id
@@ -42,46 +42,55 @@ parameters:
   - name: vf-model-invariant-id
     description: vf model invariant id
     type: string
+    short_option: b
     long_option: vf-model-invariant-id
     is_optional: false
   - name: vf-model-uuid
     description: model uuid for vf
     type: string
+    short_option: c
     long_option: vf-model-uuid
     is_optional: false
   - name: vf-model-name
     description: vf model name
     type: string
+    short_option: e
     long_option: vf-model-name
     is_optional: false
   - name: vf-model-version
     description: vf model version
     type: string
+    short_option: g
     long_option: vf-model-version
     is_optional: false
   - name: vf-model-customization-id
     description: vf model customization id
     type: string
+    short_option: i
     long_option: vf-model-customization-id
     is_optional: false
   - name: service-model-invariant-id
     description: model invariant id
     type: string
+    short_option: j
     long_option: service-model-invariant-id
     is_optional: false
   - name: service-model-uuid
     description: model name version id
     type: string
+    short_option: k
     long_option: service-model-uuid
     is_optional: false
   - name: service-model-name
     description: service model name
     type: string
+    short_option: q
     long_option: service-model-name
     is_optional: false
   - name: service-model-version
     description: service model version
     type: string
+    short_option: n
     long_option: service-model-version
     is_optional: false
 
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 51609cc5..b34d1b59 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
@@ -35,21 +35,25 @@ parameters:
 - name: model-invariant-id
   description: model invariant id for service in SDC catalog
   type: string
+  short_option: b
   long_option: model-invariant-id
   is_optional: false
 - name: model-uuid
   description: model uuid for service in SDC catalog
   type: string
+  short_option: c
   long_option: model-uuid
   is_optional: false
 - name: model-name
   description: model name available in SDC catalog
   type: string
+  short_option: e
   long_option: model-name
   is_optional: false
 - name: model-version
   description: model version of service (eg. 1.0)
   type: string
+  short_option: g
   long_option: model-version
   is_optional: false
 http:
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 74127e92..bb018b5b 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
@@ -18,27 +18,30 @@ parameters:
   - 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
+    short_option: b
     long_option: vfmodule-invariant-id
     is_optional: false
   - name: vfmodule-uuid
     description: model uuid for vfmodule
     type: string
+    short_option: c
     long_option: vfmodule-uuid
     is_optional: false
   - name: vfmodule-name
     description: vfmodule model name
     type: string
+    short_option: e
     long_option: vfmodule-name
     is_optional: false
   - name: vfmodule-version
     description: vf module version
     type: string
+    short_option: g
     long_option: vfmodule-version
     is_optional: false
   - name: module-name
@@ -50,6 +53,7 @@ parameters:
   - name: service-id
     description: unique id for service
     type: string
+    short_option: j
     long_option: service-id
     is_optional: false
   - name: vf-id
@@ -61,6 +65,7 @@ parameters:
   - 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-model-uuid
@@ -71,36 +76,43 @@ parameters:
   - name: vf-model-name
     description: vf model name
     type: string
+    short_option: n
     long_option: vf-model-name
     is_optional: false
   - name: vf-model-version
     description: vf model version
     type: string
+    short_option: o
     long_option: vf-model-version
     is_optional: false
   - name: vf-model-customization-id
     description: vf model customization id
     type: string
+    short_option: q
     long_option: vf-model-customization-id
     is_optional: false
   - name: service-model-invariant-id
     description: model invariant id
     type: string
+    short_option: r
     long_option: service-model-invariant-id
     is_optional: false
   - name: service-model-uuid
     description: model name version id
     type: string
+    short_option: w
     long_option: service-model-uuid
     is_optional: false
   - name: service-model-name
     description: service model name
     type: string
+    short_option: x
     long_option: service-model-name
     is_optional: false
   - name: service-model-version
     description: service model version
     type: string
+    short_option: z
     long_option: service-model-version
     is_optional: false