7 files changed, 193 insertions, 9 deletions
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
index bb5f4331..3609e0bc 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
@@ -73,7 +73,7 @@ http:
     method: PUT
     context:
       remove_empty_node: true
-    body: '{"pnf-name": "${pnf-name}" ,"pnf-id": "${pnf-id}","equip-type": "${equip-type}","equip-vendor": "${equip-vendor}","in-maint": "${in-maint}","prov-status": "${prov-status}","relationship-list": ["${relationship}"]}'
+    body: '{"pnf-name": "${pnf-name}" ,"pnf-id": "${pnf-id}","equip-type": "${equip-type}","equip-vendor": "${equip-vendor}","in-maint": "${in-maint}","prov-status": "${prov-status}","relationship-list": "${relationship}"}'
   success_codes:
     - 200
     - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-create-with-template-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-create-with-template-schema.yaml
new file mode 100644
index 00000000..a7ba8eea
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-create-with-template-schema.yaml
@@ -0,0 +1,61 @@
+# Copyright 2018 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-create-with-template
+description: Create a service-instance with a template. this is flexible approch to create service-instance , all the parameters are in template json file
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: global-customer-id
+    description: global-customer-id
+    type: string
+    short_option: g
+    long_option: global-customer-id
+    is_optional: false
+  - name: service-type
+    description: service-type
+    type: string
+    short_option: z
+    long_option: service-type
+    is_optional: false
+  - name: service-instance-id
+    description: service-instance-id
+    type: string
+    short_option: i
+    long_option: service-instance-id
+    is_optional: false
+  - name: template
+    description: template
+    type: json
+    short_option: r
+    long_option: template
+    is_optional: false
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '"${template}"'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
index 44f3a707..ac9d2734 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
@@ -29,7 +29,7 @@ parameters:
     long_option: global-customer-id
     is_optional: false
   - name: service-type
-    description: service-type 
+    description: service-type
     type: string
     short_option: z
     long_option: service-type
@@ -57,13 +57,13 @@ parameters:
 #                    }
 #                ]
 #            }
-    
+
 http:
   service:
     auth: basic
     mode: direct
   request:
-    uri: /business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship	
+    uri: /aai/v11/business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship
     method: PUT
     context:
       remove_empty_node: true
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
index 236a69e7..b70aeeb5 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
@@ -30,7 +30,7 @@ parameters:
     long_option: global-customer-id
     is_optional: false
   - name: service-type
-    description: service-type 
+    description: service-type
     type: string
     short_option: z
     long_option: service-type
@@ -58,13 +58,13 @@ parameters:
 #                    }
 #                ]
 #            }
-    
+
 http:
   service:
     auth: basic
     mode: direct
   request:
-    uri: /business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship	
+    uri: /aai/v11/business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship
     method: DELETE
     context:
       remove_empty_node: true
@@ -72,3 +72,4 @@ http:
   success_codes:
     - 200
     - 201
+    - 204
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-list-schema.yaml
new file mode 100644
index 00000000..3c62301c
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-list-schema.yaml
@@ -0,0 +1,67 @@
+# Copyright 2018 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-relationship-list
+description: list a service instance relationship for vnf/pnf
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: global-customer-id
+    description: global-customer-id
+    type: string
+    short_option: g
+    long_option: global-customer-id
+    is_optional: false
+  - name: service-type
+    description: service-type
+    type: string
+    short_option: z
+    long_option: service-type
+    is_optional: false
+  - name: service-instance-id
+    description: service-instance-id
+    type: string
+    short_option: i
+    long_option: service-instance-id
+    is_optional: false
+results:
+  direction: landscape
+  attributes:
+    - name: related-to
+      description: related-to
+      scope: short
+      type: string
+    - name: related-link
+      description: related-link
+      scope: short
+      type: string
+
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship
+    method: GET
+  success_codes:
+    - 200
+    - 201
+  result_map:
+    related-to: $b{relationship-list.relationship.[*].related-to}
+    related-link: $b{relationship-list.relationship.[*].related-link}
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-with-template-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-with-template-schema.yaml
new file mode 100644
index 00000000..a6f38664
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-with-template-schema.yaml
@@ -0,0 +1,55 @@
+# Copyright 2018 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-create-with-template
+description: Create a subscription of a customer with template
+
+info:
+  product: onap-beijing
+  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
+  - name: service-type
+    description: Onap service type
+    type: string
+    short_option: e
+    long_option: service-type
+    is_optional: false
+  - name: template
+    description: template
+    type: json
+    short_option: r
+    long_option: template
+    is_optional: false
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '"${template}"'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
index a50f4a2e..df9687b5 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
@@ -27,7 +27,7 @@ parameters:
     type: string
     short_option: n
     long_option: name
-    is_optional: true
+    is_optional: false
   - name: vnf-id
     description: vnf-id
     type: string
@@ -39,7 +39,7 @@ parameters:
     type: string
     short_option: z
     long_option: vnf-type
-    is_optional: true
+    is_optional: false
   - name: in-maint
     description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
     type: bool