Merge changes I7a70db85,Ie47c6bc6,Id41bdc90,I6d223c5e,I77d3ffac, ...

* changes:
  Bug fix in policy-type-list-with-version command in onap-dublin product
  Added sample for policy-type-list-with-version command
  Added command to get policy type with version
  Bug fix in policy-type-list command in onap-dublin product
  Added sample for policy-type-list command
  Added command to get policy type

8 files changed, 297 insertions, 6 deletions

diff --git a/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-dublin.yaml b/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-dublin.yaml
index 5b2dd407..d9b6236b 100644
--- a/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-dublin.yaml
+++ b/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-dublin.yaml
@@ -25,8 +25,8 @@ parameters:
   - name: policy-type-id
     description: Policy type ID
     type: string
-    long-option: policy-type-id
-    short-option: x
+    long_option: policy-type-id
+    short_option: x
     is_optional: false
 
 results:
diff --git a/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-dublin.yaml b/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-dublin.yaml
index 57b12c25..ac4a55cd 100644
--- a/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-dublin.yaml
+++ b/products/onap-dublin/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-dublin.yaml
@@ -25,14 +25,14 @@ parameters:
   - name: policy-type-id
     description: Policy type ID
     type: string
-    long-option: policy-type-id
-    short-option: x
+    long_option: policy-type-id
+    short_option: x
     is_optional: false
   - name: version-id
     description: Policy type version ID
     type: string
-    long-option: version-id
-    short-option: y
+    long_option: version-id
+    short_option: y
     is_optional: false
 
 results:
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-moco.json
new file mode 100644
index 00000000..6323a4ca
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-moco.json
@@ -0,0 +1,43 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app",
+    "headers" : {
+      "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+      "Accept" : "application/json",
+      "Environment" : "TEST",
+      "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "tosca_definitions_version" : "tosca_simple_yaml_1_0_0",
+      "policy_types" : [ {
+        "onap.policies.monitoring.cdap.tca.hi.lo.app" : {
+          "properties" : {
+            "tca_policy" : {
+              "name" : "tca_policy",
+              "type" : "map",
+              "typeVersion" : "0.0.0",
+              "description" : "TCA Policy JSON",
+              "required" : false,
+              "entry_schema" : {
+                "type" : "onap.datatypes.monitoring.tca_policy",
+                "typeVersion" : "0.0.0"
+              }
+            }
+          },
+          "name" : "onap.policies.monitoring.cdap.tca.hi.lo.app",
+          "version" : "1.0.0",
+          "derived_from" : "onap.policies.Monitoring:0.0.0",
+          "metadata" : { }
+        }
+      } ],
+      "name" : "ToscaServiceTemplateSimple",
+      "version" : "1.0.0"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-sample.yaml
new file mode 100644
index 00000000..08fca73f
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-schema-elalto-sample.yaml
@@ -0,0 +1,42 @@
+# 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-type-list
+version: onap-elalto
+samples:
+  sample1:
+    name: policy-type-list
+    input: --policy-type-id onap.policies.monitoring.cdap.tca.hi.lo.app -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+    moco: policy-type-list-schema-elalto-moco.json
+    output: |
+      +----------------------------------------------------+
+      |Type properties                                     |
+      +----------------------------------------------------+
+      |tosca_simple_yaml_1_0_0                             |
+      +----------------------------------------------------+
+      |[{"onap.policies.monitoring.cdap.tca.hi.lo.app":{"  |
+      |properties":{"tca_policy":{"name":"tca_policy","ty  |
+      |pe":"map","typeVersion":"0.0.0","description":"TCA  |
+      | Policy JSON","required":false,"entry_schema":{"ty  |
+      |pe":"onap.datatypes.monitoring.tca_policy","typeVe  |
+      |rsion":"0.0.0"}}},"name":"onap.policies.monitoring  |
+      |.cdap.tca.hi.lo.app","version":"1.0.0","derived_fr  |
+      |om":"onap.policies.Monitoring:0.0.0","metadata":{}  |
+      |}}]                                                 |
+      +----------------------------------------------------+
+      |ToscaServiceTemplateSimple                          |
+      +----------------------------------------------------+
+      |1.0.0                                               |
+      +----------------------------------------------------+
\ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-moco.json b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-moco.json
new file mode 100644
index 00000000..45b7591e
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-moco.json
@@ -0,0 +1,43 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0",
+    "headers" : {
+      "Authorization" : "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
+      "Accept" : "application/json",
+      "Environment" : "TEST",
+      "ClientAuth" : "cHl0aG9uOnRlc3Q=",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "tosca_definitions_version" : "tosca_simple_yaml_1_0_0",
+      "policy_types" : [ {
+        "onap.policies.monitoring.cdap.tca.hi.lo.app" : {
+          "properties" : {
+            "tca_policy" : {
+              "name" : "tca_policy",
+              "type" : "map",
+              "typeVersion" : "0.0.0",
+              "description" : "TCA Policy JSON",
+              "required" : false,
+              "entry_schema" : {
+                "type" : "onap.datatypes.monitoring.tca_policy",
+                "typeVersion" : "0.0.0"
+              }
+            }
+          },
+          "name" : "onap.policies.monitoring.cdap.tca.hi.lo.app",
+          "version" : "1.0.0",
+          "derived_from" : "onap.policies.Monitoring:0.0.0",
+          "metadata" : { }
+        }
+      } ],
+      "name" : "ToscaServiceTemplateSimple",
+      "version" : "1.0.0"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-sample.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-sample.yaml
new file mode 100644
index 00000000..845abd67
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-sample/policy/policy-type-list-with-version-schema-elalto-sample.yaml
@@ -0,0 +1,42 @@
+# 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-type-list-with-version
+version: onap-elalto
+samples:
+  sample1:
+    name: policy-type-list-with-version
+    input: --policy-type-id onap.policies.monitoring.cdap.tca.hi.lo.app --version-id 1.0.0 -m https://172.16.0.82:6969 -u healthcheck -p zb!XztG34
+    moco: policy-type-list-with-version-schema-elalto-moco.json
+    output: |
+      +----------------------------------------------------+
+      |Type properties                                     |
+      +----------------------------------------------------+
+      |tosca_simple_yaml_1_0_0                             |
+      +----------------------------------------------------+
+      |[{"onap.policies.monitoring.cdap.tca.hi.lo.app":{"  |
+      |properties":{"tca_policy":{"name":"tca_policy","ty  |
+      |pe":"map","typeVersion":"0.0.0","description":"TCA  |
+      | Policy JSON","required":false,"entry_schema":{"ty  |
+      |pe":"onap.datatypes.monitoring.tca_policy","typeVe  |
+      |rsion":"0.0.0"}}},"name":"onap.policies.monitoring  |
+      |.cdap.tca.hi.lo.app","version":"1.0.0","derived_fr  |
+      |om":"onap.policies.Monitoring:0.0.0","metadata":{}  |
+      |}}]                                                 |
+      +----------------------------------------------------+
+      |ToscaServiceTemplateSimple                          |
+      +----------------------------------------------------+
+      |1.0.0                                               |
+      +----------------------------------------------------+
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-elalto.yaml
new file mode 100644
index 00000000..a7e32765
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-schema-elalto.yaml
@@ -0,0 +1,58 @@
+# 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-type-list
+description: Retrieve existing policy types
+
+info:
+  product: onap-elalto
+  service: policy
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: policy-type-id
+    description: Policy type ID
+    type: string
+    long_option: policy-type-id
+    short_option: x
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: Type properties
+      description: Policy type properties
+      scope: short
+      type: json
+
+http:
+  service:
+    name: policy
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /policy/api/v1/policytypes/${policy-type-id}
+    method: GET
+    headers:
+      Accept: application/json
+      Environment: TEST
+
+
+  success_codes:
+    - 200
+
+  result_map:
+    Type properties: $b{$.[*]}
diff --git a/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-elalto.yaml b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-elalto.yaml
new file mode 100644
index 00000000..5b484de8
--- /dev/null
+++ b/products/onap-elalto/features/policy/src/main/resources/open-cli-schema/policy/policy-type-list-with-version-schema-elalto.yaml
@@ -0,0 +1,63 @@
+# 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-type-list-with-version
+description: Retrieve one particular version of a policy type
+
+info:
+  product: onap-elalto
+  service: policy
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: policy-type-id
+    description: Policy type ID
+    type: string
+    long_option: policy-type-id
+    short_option: x
+    is_optional: false
+  - name: version-id
+    description: Policy type version ID
+    type: string
+    long_option: version-id
+    short_option: y
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: Type properties
+      description: Policy type properties
+      scope: short
+      type: json
+
+http:
+  service:
+    name: policy
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /policy/api/v1/policytypes/${policy-type-id}/versions/${version-id}
+    method: GET
+    headers:
+      Accept: application/json
+      Environment: TEST
+
+  success_codes:
+    - 200
+
+  result_map:
+    Type properties: $b{$.[*]}