8 files changed, 71 insertions, 70 deletions
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-create-schema.yaml
index 729cd91a..729cd91a 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-create-schema.yaml
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-delete-schema.yaml
index bb82f499..bb82f499 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-delete-schema.yaml
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-list-schema.yaml
index eef8b4ce..eef8b4ce 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-list-schema.yaml
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-show-schema.yaml
index f22e9795..f22e9795 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logical-link/logic-link-show-schema.yaml
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
index f719f6e6..19c41f97 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
@@ -72,4 +72,3 @@ http:
   result_map:
     resource-type: $b{result-data.[*].resource-type}
     resource-link: $b{result-data.[*].resource-link}
-
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 df9687b5..ec389070 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
@@ -1,67 +1,69 @@
-# 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: vnf-create
-description: Create a vnf
-
-info:
-  product: onap-beijing
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vnf-name
-    description: vnf-name
-    type: string
-    short_option: n
-    long_option: name
-    is_optional: false
-  - name: vnf-id
-    description: vnf-id
-    type: string
-    short_option: i
-    long_option: vnf-id
-    is_optional: false
-  - name: vnf-type
-    description: vnf-type
-    type: string
-    short_option: z
-    long_option: vnf-type
-    is_optional: false
-  - name: in-maint
-    description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
-    type: bool
-    short_option: w
-    long_option: in-maint
-    is_optional: true
-  - name: relationship
-    description: relationship
-    type: json
-    short_option: r
-    long_option: relationship
-    is_optional: true
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/v11/network/generic-vnfs/generic-vnf/${vnf-id}
-    method: PUT
-    context:
-      remove_empty_node: true
-    body: '{"vnf-id": "${vnf-id}","vnf-name": "${vnf-name}" ,"vnf-type": "${vnf-type}","in-maint": "${in-maint}","relationship-list": ["${relationship}"]}'
-  success_codes:
-    - 200
-    - 201
+# 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: vnf-create
+
+description: Create a vnf directly into AAI.
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vnf-name
+    description: vnf-name
+    type: string
+    short_option: n
+    long_option: name
+    is_optional: false
+  - name: vnf-id
+    description: vnf-id
+    type: string
+    short_option: i
+    long_option: vnf-id
+    is_optional: false
+  - name: vnf-type
+    description: vnf-type
+    type: string
+    short_option: z
+    long_option: vnf-type
+    is_optional: false
+  - name: in-maint
+    description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
+    type: bool
+    short_option: w
+    long_option: in-maint
+    is_optional: true
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/generic-vnfs/generic-vnf/${vnf-id}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '{"vnf-id": "${vnf-id}","vnf-name": "${vnf-name}" ,"vnf-type": "${vnf-type}","in-maint": "${in-maint}","relationship-list": ["${relationship}"]}'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-beijing.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-beijing.yaml
index 0705b04e..685fc390 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-beijing.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-beijing.yaml
@@ -79,7 +79,7 @@ http:
   request:
     uri: /sdc2/rest/v1/catalog/services
     method: POST
-    body: '{"componentType": "SERVICE", "properties": [], "requirements": {}, "toscaArtifacts": {}, "tags": ["CLI", "${name}"], "artifacts": {}, "description": "${description}", "serviceApiArtifacts": {}, "capabilities": {}, "name": "${name}", "componentInstancesProperties": {}, "componentInstancesAttributes": {}, "contactId": "${onap-username}", "groups": [], "projectCode": "${project-code}", "deploymentArtifacts": {}, "attributes": [], "componentInstances": [], "categories": [{"normalizedName": "${category}", "name": "${category-display-name}", "uniqueId": "serviceNewCategory.${category}", "icons": ["${icon-id}"]}], "icon": "${icon-id}"}'
+    body: '{"componentType": "SERVICE", "properties": [], "requirements": {}, "toscaArtifacts": {}, "tags": ["CLI", "${name}"], "artifacts": {}, "description": "${description}", "serviceApiArtifacts": {}, "capabilities": {}, "name": "${name}", "componentInstancesProperties": {}, "componentInstancesAttributes": {}, "contactId": "${host-username}", "groups": [], "projectCode": "${project-code}", "deploymentArtifacts": {}, "attributes": [], "componentInstances": [], "categories": [{"normalizedName": "${category}", "name": "${category-display-name}", "uniqueId": "serviceNewCategory.${category}", "icons": ["${icon-id}"]}], "icon": "${icon-id}"}'
   success_codes:
     - 200
     - 201
diff --git a/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-beijing.yaml b/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-beijing.yaml
index 858dee8e..782bb5a0 100644
--- a/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-beijing.yaml
+++ b/products/onap-beijing/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-beijing.yaml
@@ -69,7 +69,7 @@ http:
   request:
     uri: /sdc2/rest/v1/catalog/resources
     method: POST
-    body: '{"contactId": "${onap-username}", "vendorRelease": "1.0", "requirements": {}, "artifacts": {}, "capabilities": {}, "componentInstancesProperties": {}, "deploymentArtifacts": {}, "icon": "defaulticon", "vendorName": "${vendor-name}", "description": "${description}", "tags": ["CLI", "${name}"], "groups": [], "properties": [], "categories": [{"subcategories": [{"normalizedName": "abstract", "name": "Abstract", "uniqueId": "resourceNewCategory.generic.abstract", "icons": ["database"]}], "normalizedName": "generic", "name": "Generic", "uniqueId": "resourceNewCategory.generic"}], "name": "${name}", "toscaArtifacts": {}, "csarUUID": "${vsp-id}", "resourceType": "VF", "csarVersion": "${vsp-version}", "componentType": "RESOURCE", "componentInstancesAttributes": {}, "attributes": [], "componentInstances": []}'
+    body: '{"contactId": "${host-username}", "vendorRelease": "1.0", "requirements": {}, "artifacts": {}, "capabilities": {}, "componentInstancesProperties": {}, "deploymentArtifacts": {}, "icon": "defaulticon", "vendorName": "${vendor-name}", "description": "${description}", "tags": ["CLI", "${name}"], "groups": [], "properties": [], "categories": [{"subcategories": [{"normalizedName": "abstract", "name": "Abstract", "uniqueId": "resourceNewCategory.generic.abstract", "icons": ["database"]}], "normalizedName": "generic", "name": "Generic", "uniqueId": "resourceNewCategory.generic"}], "name": "${name}", "toscaArtifacts": {}, "csarUUID": "${vsp-id}", "resourceType": "VF", "csarVersion": "${vsp-version}", "componentType": "RESOURCE", "componentInstancesAttributes": {}, "attributes": [], "componentInstances": []}'
   success_codes:
     - 201
   result_map: