From a4cd2403a5a171d6ab6aa6b1b0b1aae83345121b Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 29 Aug 2017 18:15:10 +0530
Subject: Add versioning for command

By allowing to add version to the YAML, helps to
create same command for multiple versions of
product say onap 1.0, 1.1

CLI-37
Change-Id: Ic3982ea912045ff4f422fcf093cbd98ecd99716d
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 .../main/resources/microservice-create-schema.yaml | 85 ---------------------
 .../main/resources/microservice-delete-schema.yaml | 31 --------
 .../main/resources/microservice-list-schema.yaml   | 49 ------------
 .../main/resources/microservice-show-schema.yaml   | 62 ----------------
 .../microservice-create-schema.yaml                | 86 ++++++++++++++++++++++
 .../microservice-delete-schema.yaml                | 32 ++++++++
 .../onap-cli-schema/microservice-list-schema.yaml  | 50 +++++++++++++
 .../onap-cli-schema/microservice-show-schema.yaml  | 63 ++++++++++++++++
 8 files changed, 231 insertions(+), 227 deletions(-)
 delete mode 100644 plugins/msb/src/main/resources/microservice-create-schema.yaml
 delete mode 100644 plugins/msb/src/main/resources/microservice-delete-schema.yaml
 delete mode 100644 plugins/msb/src/main/resources/microservice-list-schema.yaml
 delete mode 100644 plugins/msb/src/main/resources/microservice-show-schema.yaml
 create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
 create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
 create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
 create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml

(limited to 'plugins/msb/src/main/resources')

diff --git a/plugins/msb/src/main/resources/microservice-create-schema.yaml b/plugins/msb/src/main/resources/microservice-create-schema.yaml
deleted file mode 100644
index 13bd53b1..00000000
--- a/plugins/msb/src/main/resources/microservice-create-schema.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-onap_cmd_schema_version: 1.0
-name: microservice-create
-description: Register microservice into Onap
-service:
-  name: msb
-  version: v1
-
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-  - name: service-url
-    description: Onap service base url
-    type: url
-    short_option: r
-    long_option: service-url
-    is_optional: false
-  - name: node-ip
-    description: Onap service running node IP
-    type: string
-  - name: node-port
-    description: Onap service running node port
-    type: string
-  - name: create-or-update
-    description: Onap service create or update
-    type: bool
-    default_value: true
-results:
-  direction: portrait
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: long
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: string
-    - name: location
-      description: Onap service location
-      scope: long
-      type: url
-http:
-  request:
-    uri: /services
-    method: POST
-    body: '{"serviceName":"${service-name}","version":"${service-version}","url":"${service-url}","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}'
-    headers:
-    queries:
-      createOrUpdate: ${create-or-update}
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.serviceName}
-    version: $b{$.version}
-    url: $b{$.url}
-    status: $b{$.status}
-    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
-    location: $h{Location}
-
-  sample_response:
-    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
-
diff --git a/plugins/msb/src/main/resources/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/microservice-delete-schema.yaml
deleted file mode 100644
index 695efe1e..00000000
--- a/plugins/msb/src/main/resources/microservice-delete-schema.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-onap_cmd_schema_version: 1.0
-name: microservice-delete
-description: Deletes the micro service from Onap
-service:
-  name: msb
-  version: v1
-
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-http:
-  request:
-    uri: /services/${service-name}/version/${service-version}
-    method: DELETE
-  success_codes:
-    - 201
-    - 200
-    - 204
-
-
-
diff --git a/plugins/msb/src/main/resources/microservice-list-schema.yaml b/plugins/msb/src/main/resources/microservice-list-schema.yaml
deleted file mode 100644
index 42fa0ec4..00000000
--- a/plugins/msb/src/main/resources/microservice-list-schema.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-onap_cmd_schema_version: 1.0
-name: microservice-list
-description: Lists the registetred micro services in Onap
-service:
-  name: msb
-  version: v1
-  auth: none
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: long
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: json
-http:
-  request:
-    uri: /services
-    method: GET
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.[*].serviceName}
-    version: $b{$.[*].version}
-    url: $b{$.[*].url}
-    status: $b{$.[*].status}
-    nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port}
-  sample_response:
-    body: '[{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}]'
-
-
-
-
diff --git a/plugins/msb/src/main/resources/microservice-show-schema.yaml b/plugins/msb/src/main/resources/microservice-show-schema.yaml
deleted file mode 100644
index 26cccfd3..00000000
--- a/plugins/msb/src/main/resources/microservice-show-schema.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-onap_cmd_schema_version: 1.0
-name: microservice-show
-description: Details the registered microservice in Onap
-service:
-  name: msb
-  version: v1
-  auth: none
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: long
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: json
-http:
-  request:
-    uri: /services/${service-name}/version/${service-version}
-    method: GET
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.serviceName}
-    version: $b{$.version}
-    url: $b{$.url}
-    status: $b{$.status}
-    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
-  sample_response:
-    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
-
-
-
-
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
new file mode 100644
index 00000000..71f068c1
--- /dev/null
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
@@ -0,0 +1,86 @@
+onap_cmd_schema_version: 1.0
+name: microservice-create
+description: Register microservice into Onap
+version: onap-1.0
+service:
+  name: msb
+  version: v1
+
+parameters:
+  - name: service-name
+    description: Onap service name
+    type: string
+    short_option: x
+    long_option: service-name
+    is_optional: false
+  - name: service-version
+    description: Onap service version
+    type: string
+    short_option: y
+    long_option: service-version
+    is_optional: false
+  - name: service-url
+    description: Onap service base url
+    type: url
+    short_option: r
+    long_option: service-url
+    is_optional: false
+  - name: node-ip
+    description: Onap service running node IP
+    type: string
+  - name: node-port
+    description: Onap service running node port
+    type: string
+  - name: create-or-update
+    description: Onap service create or update
+    type: bool
+    default_value: true
+results:
+  direction: portrait
+  attributes:
+    - name: name
+      description: Onap service name
+      scope: short
+      type: string
+    - name: version
+      description: Onap service version
+      scope: short
+      type: string
+    - name: url
+      description: Onap service base url
+      scope: short
+      type: url
+    - name: status
+      description: Onap service status
+      scope: short
+      type: long
+    - name: nodes
+      description: Onap service running nodes
+      scope: long
+      type: string
+    - name: location
+      description: Onap service location
+      scope: long
+      type: url
+http:
+  request:
+    uri: /services
+    method: POST
+    body: '{"serviceName":"${service-name}","version":"${service-version}","url":"${service-url}","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}'
+    headers:
+    queries:
+      createOrUpdate: ${create-or-update}
+  success_codes:
+    - 201
+    - 200
+  result_map:
+    name: $b{$.serviceName}
+    version: $b{$.version}
+    url: $b{$.url}
+    status: $b{$.status}
+    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
+    location: $h{Location}
+
+  sample_response:
+    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
+
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
new file mode 100644
index 00000000..af92172f
--- /dev/null
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
@@ -0,0 +1,32 @@
+onap_cmd_schema_version: 1.0
+name: microservice-delete
+description: Deletes the micro service from Onap
+version: onap-1.0
+service:
+  name: msb
+  version: v1
+
+parameters:
+  - name: service-name
+    description: Onap service name
+    type: string
+    short_option: x
+    long_option: service-name
+    is_optional: false
+  - name: service-version
+    description: Onap service version
+    type: string
+    short_option: y
+    long_option: service-version
+    is_optional: false
+http:
+  request:
+    uri: /services/${service-name}/version/${service-version}
+    method: DELETE
+  success_codes:
+    - 201
+    - 200
+    - 204
+
+
+
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
new file mode 100644
index 00000000..1688ef24
--- /dev/null
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
@@ -0,0 +1,50 @@
+onap_cmd_schema_version: 1.0
+name: microservice-list
+description: Lists the registetred micro services in Onap
+version: onap-1.0
+service:
+  name: msb
+  version: v1
+  auth: none
+results:
+  direction: landscape
+  attributes:
+    - name: name
+      description: Onap service name
+      scope: short
+      type: string
+    - name: version
+      description: Onap service version
+      scope: short
+      type: string
+    - name: url
+      description: Onap service base url
+      scope: short
+      type: url
+    - name: status
+      description: Onap service status
+      scope: short
+      type: long
+    - name: nodes
+      description: Onap service running nodes
+      scope: long
+      type: json
+http:
+  request:
+    uri: /services
+    method: GET
+  success_codes:
+    - 201
+    - 200
+  result_map:
+    name: $b{$.[*].serviceName}
+    version: $b{$.[*].version}
+    url: $b{$.[*].url}
+    status: $b{$.[*].status}
+    nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port}
+  sample_response:
+    body: '[{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}]'
+
+
+
+
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
new file mode 100644
index 00000000..3173b779
--- /dev/null
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
@@ -0,0 +1,63 @@
+onap_cmd_schema_version: 1.0
+name: microservice-show
+description: Details the registered microservice in Onap
+version: onap-1.0
+service:
+  name: msb
+  version: v1
+  auth: none
+parameters:
+  - name: service-name
+    description: Onap service name
+    type: string
+    short_option: x
+    long_option: service-name
+    is_optional: false
+  - name: service-version
+    description: Onap service version
+    type: string
+    short_option: y
+    long_option: service-version
+    is_optional: false
+results:
+  direction: landscape
+  attributes:
+    - name: name
+      description: Onap service name
+      scope: short
+      type: string
+    - name: version
+      description: Onap service version
+      scope: short
+      type: string
+    - name: url
+      description: Onap service base url
+      scope: short
+      type: url
+    - name: status
+      description: Onap service status
+      scope: short
+      type: long
+    - name: nodes
+      description: Onap service running nodes
+      scope: long
+      type: json
+http:
+  request:
+    uri: /services/${service-name}/version/${service-version}
+    method: GET
+  success_codes:
+    - 201
+    - 200
+  result_map:
+    name: $b{$.serviceName}
+    version: $b{$.version}
+    url: $b{$.url}
+    status: $b{$.status}
+    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
+  sample_response:
+    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
+
+
+
+
-- 
cgit 1.2.3-korg