aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py6
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-elalto.yaml78
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml181
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml46
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml61
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml52
-rw-r--r--products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-elalto.yaml60
-rw-r--r--products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml46
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-moco.json25
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-sample.yaml47
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-moco.json22
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-sample.yaml47
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-moco.json22
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-sample.yaml47
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-moco.json22
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-sample.yaml47
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-moco.json24
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-sample.yaml36
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/create-operational-policy-schema-elalto.yaml75
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/delete-operational-policy-with-version-schema-elalto.yaml74
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-latest-version-schema-elalto.yaml68
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-version-schema-elalto.yaml74
-rw-r--r--products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-healthcheck-schema-elalto.yaml69
-rw-r--r--profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java4
24 files changed, 1230 insertions, 3 deletions
diff --git a/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py b/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py
index a761fb15..2141e168 100644
--- a/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py
+++ b/products/onap-dublin/features/integration/src/main/resources/script/ovp-tosca-vnf-provision.py
@@ -435,7 +435,11 @@ vnf_csar = args.vnf_csar
ns_csar = args.ns_csar
vnfm_driver = args.vnfm_driver
result_json_path = args.result_json_path
-request_id = args.request_id
+
+if args.request_id is None:
+ request_id = os.environ["OPEN_CLI_REQUEST_ID"]
+else:
+ request_id = args.request_id
# setup CLI
parameters = get_parameters(config_file)
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-elalto.yaml
new file mode 100644
index 00000000..f1f5a604
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-elalto.yaml
@@ -0,0 +1,78 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: subscription-list
+description: Lists the subscription for a given customer in Onap
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: customer-name
+ description: Onap customer name
+ type: string
+ short_option: x
+ long_option: customer-name
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: service-type
+ description: Onap service type
+ scope: short
+ type: string
+ - name: resource-version
+ description: Onap subscription resource version
+ scope: short
+ type: string
+ - name: tenant
+ description: Onap tenant name
+ scope: long
+ type: string
+ - name: region
+ description: Onap region name
+ scope: long
+ type: string
+ - name: cloud
+ description: Onap cloud name
+ scope: long
+ type: string
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/business/customers/customer/${customer-name}/service-subscriptions
+ method: GET
+ success_codes:
+ - 200
+ - 404
+ result_map:
+ service-type: $b{$.service-subscription.[*].service-type}
+ resource-version: $b{$.service-subscription.[*].resource-version}
+ tenant: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'tenant.tenant-id')].relationship-value}
+ region: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-region-id')].relationship-value}
+ cloud: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-owner')].relationship-value}
+
+ sample_response:
+ body: '{"service-subscription":[{"service-type":"vTest","resource-version":"1504091375183","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/26ab7af6-96cc-4c4e-814a-e533af4ef9f6","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"att-aic"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"AAIAIC25"},{"relationship-key":"tenant.tenant-id","relationship-value":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"test"}]}]}}]}'
+
+
+
+
+
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml
new file mode 100644
index 00000000..f834554d
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-elalto.yaml
@@ -0,0 +1,181 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: cloud-create
+description: Create a cloud region in Onap
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
+parameters:
+ - name: cloud-owner
+ description: Onap cloud owner
+ type: string
+ short_option: x
+ long_option: cloud-owner
+ is_optional: false
+ - name: region-name
+ description: Onap region name
+ type: string
+ short_option: y
+ long_option: region-name
+ is_optional: false
+ - name: cloud-type
+ description: Cloud type e.g openstack
+ type: string
+ short_option: q
+ long_option: cloud-type
+ is_optional: false
+ - name: owner-defined-type
+ description: owner defined type
+ type: string
+ short_option: r
+ long_option: owner-type
+ is_optional: false
+ - name: cloud-region-version
+ description: cloud region version e.g titanium_cloud
+ type: string
+ short_option: w
+ long_option: cloud-region-version
+ is_optional: false
+ - name: complex-name
+ description: Onap complex-name
+ type: string
+ short_option: n
+ long_option: complex-name
+ is_optional: false
+ - name: cloud-zone
+ description: Onap cloud zone
+ type: string
+ short_option: g
+ long_option: cloud-zone
+ is_optional: false
+ - name: region-name
+ description: Onap region name
+ type: string
+ short_option: y
+ long_option: region-name
+ is_optional: false
+ - name: sriov-automation
+ description: sriov automation, default is false
+ type: bool
+ short_option: S
+ long_option: sriov-automation
+ is_optional: true
+ default: false
+ - name: identity-url
+ description: Onap identity-url, updated by multicloud if multicloud is used
+ type: string
+ short_option: i
+ long_option: identity-url
+ is_optional: false
+ - name: esr-system-info-id
+ description: id for esr system (arbitrary UUID e.g 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc8)
+ type: uuid
+ short_option: e
+ long_option: esr-id
+ is_optional: false
+ - name: service-url
+ description: service-url i.e keystone url for openstack
+ type: string
+ short_option: url
+ long_option: service-url
+ is_optional: false
+ - name: user-name
+ description: cloud user name
+ type: string
+ short_option: b
+ long_option: user-name
+ is_optional: false
+ - name: password
+ description: cloud password
+ type: string
+ short_option: j
+ long_option: password
+ is_optional: false
+ - name: system-type
+ description: system type for cloud e.g VIM
+ type: string
+ short_option: Q
+ long_option: system-type
+ is_optional: false
+ - name: ssl-insecure
+ description: to use ssl insecure or not, default is true
+ type: bool
+ short_option: z
+ long_option: ssl-insecure
+ is_optional: false
+ - name: cloud-domain
+ description: cloud domain, default is Default
+ type: string
+ short_option: c
+ long_option: cloud-domain
+ is_optional: false
+ - name: default-tenant
+ description: default cloud tenant to use
+ type: string
+ short_option: l
+ long_option: default-tenant
+ is_optional: false
+ - name: system-status
+ description: status of the cloud, default is active
+ type: string
+ short_option: k
+ long_option: system-status
+ is_optional: false
+ - name: cloud-extra-info
+ description: extra info to register cloud , generally string with region id e.g {\"openstack-region-id\":\"region-id\"}, enter as {\\"openstack-region-id\\":\\"ONAP-POD-01-Rail-07\\"} with CLI
+ type: string
+ short_option: I
+ long_option: extra-info
+ is_optional: false
+
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/cloud-infrastructure/cloud-regions/cloud-region/${cloud-owner}/${region-name}
+ method: PUT
+ body: '{
+ "cloud-owner": "${cloud-owner}",
+ "cloud-region-id": "${region-name}",
+ "cloud-type": "${cloud-type}",
+ "owner-defined-type": "${owner-defined-type}",
+ "cloud-region-version": "${cloud-region-version}",
+ "complex-name":"${complex-name}",
+ "cloud-zone": "${cloud-zone}",
+ "sriov-automation": "${sriov-automation}",
+ "identity-url": "${identity-url}",
+ "cloud-extra-info":"${cloud-extra-info}",
+ "esr-system-info-list": {
+ "esr-system-info":[
+ {
+ "esr-system-info-id":"${esr-system-info-id}",
+ "service-url": "${service-url}",
+ "user-name":"${user-name}",
+ "password":"${password}",
+ "system-type": "${system-type}",
+ "ssl-insecure": "${ssl-insecure}",
+ "cloud-domain":"${cloud-domain}",
+ "default-tenant":"${default-tenant}",
+ "system-status":"${system-status}"
+ }]}
+ }'
+ success_codes:
+ - 201
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml
new file mode 100644
index 00000000..e99d1915
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml
@@ -0,0 +1,46 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: service-instance-delete
+description: Delete a service instance from ONAP
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: service-instance-id
+ description: Id of service-instance to be deleted (get from service-instance-list)
+ type: string
+ short_option: x
+ long_option: service-instance-id
+ is_optional: false
+ - name: resource-version
+ description: resource version of service instance to be deleted
+ type: uuid
+ short_option: y
+ long_option: resource-version
+ is_optional: true
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/nodes/service-instances/service-instance/${service-instance-id}?resource-version=${resource-version}
+ method: DELETE
+ success_codes:
+ - 204
+ - 404
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml
new file mode 100644
index 00000000..ad14698f
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml
@@ -0,0 +1,61 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: service-instance-list
+description: List the existing service instances
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+ direction: landscape
+ attributes:
+ - name: service-instance-name
+ description: Name of service instance
+ scope: short
+ type: string
+ - name: service-instance-id
+ description: Id of service instance
+ scope: short
+ type: string
+ - name: resource-version
+ description: resource version
+ scope: short
+ type: string
+ - name: service-model-version-id
+ description: version id of service model
+ scope: short
+ type: string
+ - name: service-model-invariant-id
+ description: Invariant Id of service model
+ scope: short
+ type: string
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/nodes/service-instances/
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ service-instance-name: $b{service-instance.[*].service-instance-name}
+ service-instance-id: $b{service-instance.[*].service-instance-id}
+ resource-version: $b{service-instance.[*].resource-version}
+ service-model-version-id: $b{service-instance.[*].model-version-id}
+ service-model-invariant-id: $b{service-instance.[*].model-invariant-id}
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml
new file mode 100644
index 00000000..4225b041
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml
@@ -0,0 +1,52 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: vf-module-delete
+description: Delete a VF module from Onap
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: vnf-id
+ description: Id of VNF that vf module belongs to
+ type: string
+ short_option: x
+ long_option: vnf-id
+ is_optional: false
+ - name: vf-module-id
+ description: Id of the vf module
+ type: string
+ short_option: y
+ long_option: vf-module-id
+ is_optional: false
+ - name: resource-version
+ description: resource version of vf-module
+ type: uuid
+ short_option: r
+ long_option: resource-version
+ is_optional: true
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules/vf-module/${vf-module-id}?resource-version=${resource-version}
+ method: DELETE
+ success_codes:
+ - 204
+ - 404
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-elalto.yaml
new file mode 100644
index 00000000..b42ca961
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-elalto.yaml
@@ -0,0 +1,60 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: vf-module-list
+description: List the VF module in a VNF instance
+
+info:
+ product: onap-elalto
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: vnf-id
+ description: id of vnf instance
+ type: string
+ short_option: x
+ long_option: vnf-id
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: vf-module-name
+ description: Name of the vf-module
+ scope: short
+ type: string
+ - name: vf-module-id
+ description: Id of the vf-module
+ scope: short
+ type: string
+ - name: resource-version
+ description: resource version of the vf module
+ scope: short
+ type: string
+
+http:
+ service:
+ auth: basic
+ mode: direct
+ request:
+ uri: /aai/v16/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ vf-module-name: $b{vf-module.[*].vf-module-name}
+ vf-module-id: $b{vf-module.[*].vf-module-id}
+ resource-version: $b{vf-module.[*].resource-version}
diff --git a/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml b/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml
new file mode 100644
index 00000000..eba73df5
--- /dev/null
+++ b/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml
@@ -0,0 +1,46 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: multicloud-register-cloud
+description: Register a cloud region with multicloud plugin
+
+info:
+ product: onap-elalto
+ service: multicloud
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: cloud-region
+ description: Onap Cloud region name
+ type: string
+ short_option: x
+ long_option: cloud-region
+ is_optional: false
+ - name: cloud-owner
+ description: Onap Cloud Owner name
+ type: string
+ short_option: y
+ long_option: cloud-owner
+ is_optional: false
+
+http:
+ service:
+ auth: none
+ mode: direct
+ request:
+ uri: /api/multicloud/v0/${cloud-owner}_${cloud-region}/registry
+ method: POST
+ success_codes:
+ - 202
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-moco.json
new file mode 100644
index 00000000..119f8c91
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-moco.json
@@ -0,0 +1,25 @@
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies",
+ "headers" : {
+ "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+ "Accept" : "application/json",
+ "Environment" : "TEST",
+ "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "policy-id" : "operational.BandwidthOnDemand",
+ "content" : "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "policy-id" : "operational.BandwidthOnDemand",
+ "policy-version" : "6",
+ "content" : "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-sample.yaml
new file mode 100644
index 00000000..ebbc694c
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/create-operational-policy-schema-elalto-sample.yaml
@@ -0,0 +1,47 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_sample_version: 1.0
+name: create-operational-policy
+version: onap-elalto
+samples:
+ sample1:
+ name: create-operational-policy
+ input: --policy-id operational.BandwidthOnDemand --content controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+ moco: create-operational-policy-schema-elalto-moco.json
+ output: |
+ +----------------+----------------------------------------------------+
+ |property |value |
+ +----------------+----------------------------------------------------+
+ |policy-id |operational.BandwidthOnDemand |
+ +----------------+----------------------------------------------------+
+ |policy-version |6 |
+ +----------------+----------------------------------------------------+
+ |content |controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++cont |
+ | |rolLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-484 |
+ | |3-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+uniqu |
+ | |e-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A |
+ | |+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicie |
+ | |s%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthO |
+ | |nDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D |
+ | |%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A |
+ | |++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A |
+ | |%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++ |
+ | |++timeout%3A+1200%0D%0A++++success%3A+final_succes |
+ | |s%0D%0A++++failure%3A+final_failure%0D%0A++++failu |
+ | |re_timeout%3A+final_failure_timeout%0D%0A++++failu |
+ | |re_retries%3A+final_failure_retries%0D%0A++++failu |
+ | |re_exception%3A+final_failure_exception%0D%0A++++f |
+ | |ailure_guard%3A+final_failure_guard |
+ +----------------+----------------------------------------------------+ \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-moco.json
new file mode 100644
index 00000000..18acd236
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-moco.json
@@ -0,0 +1,22 @@
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.BandwidthOnDemand/versions/5",
+ "headers" : {
+ "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+ "Accept" : "application/json",
+ "Environment" : "TEST",
+ "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "policy-id" : "operational.BandwidthOnDemand",
+ "policy-version" : "5",
+ "content" : "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-sample.yaml
new file mode 100644
index 00000000..4a31a206
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/delete-operational-policy-with-version-schema-elalto-sample.yaml
@@ -0,0 +1,47 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_sample_version: 1.0
+name: delete-operational-policy-with-version
+version: onap-elalto
+samples:
+ sample1:
+ name: delete-operational-policy-with-version
+ input: --policy-id operational.BandwidthOnDemand --policy-version 5 -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+ moco: delete-operational-policy-with-version-schema-elalto-moco.json
+ output: |
+ +----------------+----------------------------------------------------+
+ |property |value |
+ +----------------+----------------------------------------------------+
+ |policy-id |operational.BandwidthOnDemand |
+ +----------------+----------------------------------------------------+
+ |policy-version |5 |
+ +----------------+----------------------------------------------------+
+ |content |controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++cont |
+ | |rolLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-484 |
+ | |3-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+uniqu |
+ | |e-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A |
+ | |+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicie |
+ | |s%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthO |
+ | |nDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D |
+ | |%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A |
+ | |++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A |
+ | |%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++ |
+ | |++timeout%3A+1200%0D%0A++++success%3A+final_succes |
+ | |s%0D%0A++++failure%3A+final_failure%0D%0A++++failu |
+ | |re_timeout%3A+final_failure_timeout%0D%0A++++failu |
+ | |re_retries%3A+final_failure_retries%0D%0A++++failu |
+ | |re_exception%3A+final_failure_exception%0D%0A++++f |
+ | |ailure_guard%3A+final_failure_guard |
+ +----------------+----------------------------------------------------+ \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-moco.json
new file mode 100644
index 00000000..7a1557b3
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-moco.json
@@ -0,0 +1,22 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.BandwidthOnDemand/versions/latest",
+ "headers" : {
+ "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+ "Accept" : "application/json",
+ "Environment" : "TEST",
+ "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "policy-id" : "operational.BandwidthOnDemand",
+ "policy-version" : "4",
+ "content" : "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-sample.yaml
new file mode 100644
index 00000000..333ea582
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-latest-version-schema-elalto-sample.yaml
@@ -0,0 +1,47 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_sample_version: 1.0
+name: get-operational-policy-with-latest-version
+version: onap-elalto
+samples:
+ sample1:
+ name: get-operational-policy-with-latest-version
+ input: --policy-id operational.BandwidthOnDemand -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+ moco: get-operational-policy-with-latest-version-schema-elalto-moco.json
+ output: |
+ +----------------+----------------------------------------------------+
+ |property |value |
+ +----------------+----------------------------------------------------+
+ |policy-id |operational.BandwidthOnDemand |
+ +----------------+----------------------------------------------------+
+ |policy-version |4 |
+ +----------------+----------------------------------------------------+
+ |content |controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++cont |
+ | |rolLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-484 |
+ | |3-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+uniqu |
+ | |e-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A |
+ | |+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicie |
+ | |s%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthO |
+ | |nDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D |
+ | |%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A |
+ | |++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A |
+ | |%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++ |
+ | |++timeout%3A+1200%0D%0A++++success%3A+final_succes |
+ | |s%0D%0A++++failure%3A+final_failure%0D%0A++++failu |
+ | |re_timeout%3A+final_failure_timeout%0D%0A++++failu |
+ | |re_retries%3A+final_failure_retries%0D%0A++++failu |
+ | |re_exception%3A+final_failure_exception%0D%0A++++f |
+ | |ailure_guard%3A+final_failure_guard |
+ +----------------+----------------------------------------------------+ \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-moco.json
new file mode 100644
index 00000000..83f95ce3
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-moco.json
@@ -0,0 +1,22 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.BandwidthOnDemand/versions/4",
+ "headers" : {
+ "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+ "Accept" : "application/json",
+ "Environment" : "TEST",
+ "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "policy-id" : "operational.BandwidthOnDemand",
+ "policy-version" : "4",
+ "content" : "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthOnDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-sample.yaml
new file mode 100644
index 00000000..7425bf45
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/get-operational-policy-with-version-schema-elalto-sample.yaml
@@ -0,0 +1,47 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_sample_version: 1.0
+name: get-operational-policy-with-version
+version: onap-elalto
+samples:
+ sample1:
+ name: get-operational-policy-with-version
+ input: --policy-id operational.BandwidthOnDemand --policy-version 4 -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+ moco: get-operational-policy-with-version-schema-elalto-moco.json
+ output: |
+ +----------------+----------------------------------------------------+
+ |property |value |
+ +----------------+----------------------------------------------------+
+ |policy-id |operational.BandwidthOnDemand |
+ +----------------+----------------------------------------------------+
+ |policy-version |4 |
+ +----------------+----------------------------------------------------+
+ |content |controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++cont |
+ | |rolLoopName%3A+ControlLoop-CCVPN-2179b738-fd36-484 |
+ | |3-a71a-a8c24c70c22b%0D%0A++trigger_policy%3A+uniqu |
+ | |e-policy-id-16-BandwidthOnDemand%0D%0A++timeout%3A |
+ | |+3600%0D%0A++abatement%3A+false%0D%0A%0D%0Apolicie |
+ | |s%3A%0D%0A++-+id%3A+unique-policy-id-16-BandwidthO |
+ | |nDemand%0D%0A++++name%3A+CCVPNBandwidthOnDemand%0D |
+ | |%0A++++description%3A%0D%0A++++actor%3A+SDNC%0D%0A |
+ | |++++recipe%3A+BandwidthOnDemand%0D%0A++++target%3A |
+ | |%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++ |
+ | |++timeout%3A+1200%0D%0A++++success%3A+final_succes |
+ | |s%0D%0A++++failure%3A+final_failure%0D%0A++++failu |
+ | |re_timeout%3A+final_failure_timeout%0D%0A++++failu |
+ | |re_retries%3A+final_failure_retries%0D%0A++++failu |
+ | |re_exception%3A+final_failure_exception%0D%0A++++f |
+ | |ailure_guard%3A+final_failure_guard |
+ +----------------+----------------------------------------------------+ \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-moco.json
new file mode 100644
index 00000000..fed08d52
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-moco.json
@@ -0,0 +1,24 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/policy/api/v1/healthcheck",
+ "headers" : {
+ "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+ "Accept" : "application/json",
+ "Environment" : "TEST",
+ "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "name" : "Policy API",
+ "url" : "self",
+ "healthy" : true,
+ "code" : 200,
+ "message" : "alive"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-sample.yaml
new file mode 100644
index 00000000..b3d44af2
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-healthcheck-schema-elalto-sample.yaml
@@ -0,0 +1,36 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_sample_version: 1.0
+name: policy-healthcheck
+version: onap-elalto
+samples:
+ sample1:
+ name: policy-healthcheck
+ input: -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+ moco: policy-healthcheck-schema-elalto-moco.json
+ output: |
+ +----------+------------+
+ |property |value |
+ +----------+------------+
+ |name |Policy API |
+ +----------+------------+
+ |url |self |
+ +----------+------------+
+ |healthy |true |
+ +----------+------------+
+ |code |200 |
+ +----------+------------+
+ |message |alive |
+ +----------+------------+
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/create-operational-policy-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/create-operational-policy-schema-elalto.yaml
new file mode 100644
index 00000000..8aca4449
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/create-operational-policy-schema-elalto.yaml
@@ -0,0 +1,75 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: create-operational-policy
+description: Create a new operational policy.
+
+info:
+ product: onap-elalto
+ service: policy
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: policy-id
+ description: ID
+ type: string
+ long_option: policy-id
+ short_option: x
+ is_optional: false
+ - name: content
+ description: Operational policy in encoded format
+ type: string
+ long_option: content
+ short_option: y
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: policy-id
+ description: ID of policy
+ scope: short
+ type: string
+ - name: policy-version
+ description: Version of policy
+ scope: short
+ type: string
+ - name: content
+ description: Content of policy
+ scope: short
+ type: string
+
+http:
+ service:
+ name: policy
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies
+ method: POST
+ body: '{"policy-id":"${policy-id}","content":"${content}"}'
+ headers:
+ Accept: application/json
+ Environment: TEST
+
+
+ success_codes:
+ - 200
+
+ result_map:
+ policy-id: $b{$.policy-id}
+ policy-version: $b{$.policy-version}
+ content: $b{$.content} \ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/delete-operational-policy-with-version-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/delete-operational-policy-with-version-schema-elalto.yaml
new file mode 100644
index 00000000..0e8a5613
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/delete-operational-policy-with-version-schema-elalto.yaml
@@ -0,0 +1,74 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: delete-operational-policy-with-version
+description: Delete a particular version of a specified operational policy.
+
+info:
+ product: onap-elalto
+ service: policy
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: policy-id
+ description: ID of policy
+ type: string
+ long_option: policy-id
+ short_option: x
+ is_optional: false
+ - name: policy-version
+ description: Version of policy
+ type: string
+ long_option: policy-version
+ short_option: y
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: policy-id
+ description: ID of policy
+ scope: short
+ type: string
+ - name: policy-version
+ description: Version of policy
+ scope: short
+ type: string
+ - name: content
+ description: Content of policy
+ scope: short
+ type: string
+
+http:
+ service:
+ name: policy
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/${policy-id}/versions/${policy-version}
+ method: DELETE
+ headers:
+ Accept: application/json
+ Environment: TEST
+
+
+ success_codes:
+ - 200
+
+ result_map:
+ policy-id: $b{$.policy-id}
+ policy-version: $b{$.policy-version}
+ content: $b{$.content}
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-latest-version-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-latest-version-schema-elalto.yaml
new file mode 100644
index 00000000..9f5985ca
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-latest-version-schema-elalto.yaml
@@ -0,0 +1,68 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: get-operational-policy-with-latest-version
+description: Retrieve the latest version of a particular operational policy.
+
+info:
+ product: onap-elalto
+ service: policy
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: policy-id
+ description: ID of policy
+ type: string
+ long_option: policy-id
+ short_option: x
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: policy-id
+ description: ID of policy
+ scope: short
+ type: string
+ - name: policy-version
+ description: Version of policy
+ scope: short
+ type: string
+ - name: content
+ description: Content of policy
+ scope: short
+ type: string
+
+http:
+ service:
+ name: policy
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/${policy-id}/versions/latest
+ method: GET
+ headers:
+ Accept: application/json
+ Environment: TEST
+
+
+ success_codes:
+ - 200
+
+ result_map:
+ policy-id: $b{$.policy-id}
+ policy-version: $b{$.policy-version}
+ content: $b{$.content}
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-version-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-version-schema-elalto.yaml
new file mode 100644
index 00000000..f24bb111
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/get-operational-policy-with-version-schema-elalto.yaml
@@ -0,0 +1,74 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: get-operational-policy-with-version
+description: Retrieve one version of a particular operational policy.
+
+info:
+ product: onap-elalto
+ service: policy
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+ - name: policy-id
+ description: ID of policy
+ type: string
+ long_option: policy-id
+ short_option: x
+ is_optional: false
+ - name: policy-version
+ description: Version of policy
+ type: string
+ long_option: policy-version
+ short_option: y
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: policy-id
+ description: ID of policy
+ scope: short
+ type: string
+ - name: policy-version
+ description: Version of policy
+ scope: short
+ type: string
+ - name: content
+ description: Content of policy
+ scope: short
+ type: string
+
+http:
+ service:
+ name: policy
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/${policy-id}/versions/${policy-version}
+ method: GET
+ headers:
+ Accept: application/json
+ Environment: TEST
+
+
+ success_codes:
+ - 200
+
+ result_map:
+ policy-id: $b{$.policy-id}
+ policy-version: $b{$.policy-version}
+ content: $b{$.content}
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-healthcheck-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-healthcheck-schema-elalto.yaml
new file mode 100644
index 00000000..67937dd5
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-healthcheck-schema-elalto.yaml
@@ -0,0 +1,69 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: policy-healthcheck
+description: Returns healthy status of the Policy API component
+
+info:
+ product: onap-elalto
+ service: policy
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+ direction: portrait
+ attributes:
+ - name: name
+ description: name
+ scope: short
+ type: string
+ - name: url
+ description: url
+ scope: short
+ type: string
+ - name: healthy
+ description: health check status
+ scope: short
+ type: string
+ - name: code
+ description: response code
+ scope: short
+ type: string
+ - name: message
+ description: health check message
+ scope: short
+ type: string
+
+http:
+ service:
+ name: policy
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /policy/api/v1/healthcheck
+ method: GET
+ headers:
+ Accept: application/json
+ Environment: TEST
+
+ success_codes:
+ - 200
+
+ result_map:
+ name: $b{$.name}
+ url: $b{$.url}
+ healthy: $b{$.healthy}
+ code: $b{$.code}
+ message: $b{$.message}
diff --git a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
index 884cde12..40ccf5c4 100644
--- a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
+++ b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
@@ -206,10 +206,10 @@ public class OpenCommandShellCmd extends OnapCommand {
pr.setStderr(stderrStream);
OnapCommandExecutionStore.getStore().storeExectutionDebug(this.getExecutionContext(), pr.toString());
- } else {
- this.getResult().setDebugInfo(pr.toString());
}
+ this.getResult().setDebugInfo(pr.toString());
+
pr.run();
} catch (Exception e) {
throw new OnapCommandExecutionFailed(this.getName(), e);