Yaml update for PNF VNF

Change-Id: Ic42e4e0a1a99d90cc5059e201103fd8dacb6e51c
Issue-ID: CLI-93
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>

6 files changed, 185 insertions, 6 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 7b7b3bbb..bb5f4331 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
@@ -37,25 +37,25 @@ parameters:
   - name: equip-type

     description: equip-type

     type: string

-    short_option: t

+    short_option: q

     long_option: equipType

     is_optional: true

   - name: equip-vendor

     description: equip-vendor

     type: string

-    short_option: v

+    short_option: x

     long_option: equip-vendor

     is_optional: true

   - name: in-maint

     description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)

     type: bool

-    short_option: i

+    short_option: w

     long_option: in-maint

     is_optional: true

   - name: prov-status

     description: Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]

     type: string

-    short_option: s

+    short_option: g

     long_option: prov-status

     is_optional: true

   - name: relationship

@@ -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/pnf/pnf-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
index cbc4b57c..f4be138c 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
@@ -32,7 +32,7 @@ parameters:
   - name: resource-version

     description: Onap pnf resource version

     type: uuid

-    short_option: v

+    short_option: b

     long_option: resource-version

     is_optional: false

 http:

diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
index fd5832b0..f989828f 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
@@ -32,6 +32,10 @@ results:
       description: Onap pnf id

       scope: short

       type: string

+    - name: resource-version

+      description: Onap resource-version

+      scope: short

+      type: string

 http:

   service:

     auth: basic

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
new file mode 100644
index 00000000..a50f4a2e
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-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: 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: true

+  - 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: true

+  - 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/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml
new file mode 100644
index 00000000..1a1e3fe1
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml
@@ -0,0 +1,47 @@
+# 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-delete

+description: Delete vnf from Onap

+

+info:

+  product: onap-beijing

+  service: aai

+  author: ONAP CLI Team onap-discuss@lists.onap.org

+

+

+parameters:

+  - name: vnf-id

+    description: Onap vnf id

+    type: string

+    short_option: i

+    long_option: vnf-id

+    is_optional: false

+  - name: resource-version

+    description: Onap vnf resource version

+    type: uuid

+    short_option: b

+    long_option: resource-version

+    is_optional: false

+http:

+  service:

+    auth: basic

+    mode: direct

+  request:

+    uri: /aai/v11/network/generic-vnfs/generic-vnf/${vnf-id}?resource-version=${resource-version}

+    method: DELETE

+  success_codes:

+    - 204

+    - 404

diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml
new file mode 100644
index 00000000..2b5b844a
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-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: vnf-list

+description: Lists the vnfs

+

+info:

+  product: onap-beijing

+  service: aai

+  author: ONAP CLI Team onap-discuss@lists.onap.org

+

+results:

+  direction: landscape

+  attributes:

+    - name: vnf-name

+      description: Onap vnf name

+      scope: short

+      type: string

+    - name: vnf-id

+      description: Onap vnf id

+      scope: short

+      type: string

+    - name: vnf-type

+      description: Onap vnf-type

+      scope: short

+      type: string

+    - name: in-maint

+      description: Onap in-maint

+      scope: short

+      type: string

+    - name: resource-version

+      description: Onap resource-version

+      scope: short

+      type: string

+http:

+  service:

+    auth: basic

+    mode: direct

+  request:

+    uri: /aai/v11/network/generic-vnfs

+    method: GET

+  success_codes:

+    - 200

+  result_map:

+    vnf-name: $b{generic-vnf.[*].vnf-name}

+    vnf-id: $b{generic-vnf.[*].vnf-id}

+    vnf-type: $b{generic-vnf.[*].vnf-type}

+    in-maint: $b{generic-vnf.[*].in-maint}

+    resource-version: $b{generic-vnf.[*].resource-version}