From: Lukasz Rajewski <lukasz.rajewski@orange.com>
Date: Fri, 29 Nov 2019 15:30:55 +0000 (+0100)
Subject: VNFC Support for Ansible actions
X-Git-Tag: 1.7.0~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc%2Fdeployment.git;a=commitdiff_plain;h=7bbb02c6b894d63e39dfbe6dc8f59cd7bad7e748

VNFC Support for Ansible actions

Introduced AutoNodeList parameter for
ansible request template which allows to generate
NodeList section from infromation about VMs and VNFC
in the AAI. List is being filtered by vnfc-name,vserver-id,
vnfc-type and vf-module-id parameters which can be specified
in the request-parameters of payload section.

Change-Id: I4d840dd4e103668844108dc249e1ba2a551245a1
Signed-off-by: <lukasz.rajewski@orange.com>
Issue-ID: APPC-1729
---

diff --git a/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json b/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json
index 72d1618..45ec5b9 100644
--- a/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json
+++ b/platform-logic/appc/src/main/json/APPC_ansible-adapter-1.0.json
@@ -48,7 +48,7 @@
     "id": "16608a2e.c8019e",
     "type": "execute",
     "name": "execute",
-    "xml": "<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$AgentUrl`'/>\n  <parameter name='User' value='`$User`'/>\n                        <parameter name='Password' value='`$Password`'/>\n                        <parameter name='LocalParameters' value='`$LocalParameters`'/>\n                        <parameter name='EnvParameters' value='`$EnvParameters`'/>\n                        <parameter name='FileParameters' value='`$FileParameters`'/>\n                        <parameter name='NodeList' value='`$NodeList`'/>\n                        <parameter name='Timeout' value='`$Timeout`'/>\n                        <parameter name='Version' value='`$Version`'/>\n                        <parameter name='InventoryNames' value='`$InventoryNames`'/>\n                        <parameter name='PlaybookName' value='`$PlaybookName`'/>\n                        <parameter name='Action' value='`$Action`'/>\n",
+    "xml": "<execute plugin='org.onap.appc.adapter.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$AgentUrl`'/>\n  <parameter name='User' value='`$User`'/>\n                        <parameter name='Password' value='`$Password`'/>\n                        <parameter name='LocalParameters' value='`$LocalParameters`'/>\n                        <parameter name='EnvParameters' value='`$EnvParameters`'/>\n                        <parameter name='FileParameters' value='`$FileParameters`'/>\n                        <parameter name='AutoNodeList' value='`$AutoNodeList`'/>\n                        <parameter name='NodeList' value='`$NodeList`'/>\n                        <parameter name='Timeout' value='`$Timeout`'/>\n                        <parameter name='Version' value='`$Version`'/>\n                        <parameter name='InventoryNames' value='`$InventoryNames`'/>\n                        <parameter name='PlaybookName' value='`$PlaybookName`'/>\n                        <parameter name='Action' value='`$Action`'/>\n                        <parameter name='vnfc-name' value='`$request-parameters.vnfc-name`'/>\n                        <parameter name='vnfc-type' value='`$request-parameters.vnfc-type`'/>\n                        <parameter name='vserver-id' value='`$request-parameters.vserver-id`'/>\n                        <parameter name='vf-module-id' value='`$request-parameters.vf-module-id`'/>\n",
     "comments": "",
     "outputs": 1,
     "x": 569,
diff --git a/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml b/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml
index 062a80f..b80ebe0 100644
--- a/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml
+++ b/platform-logic/appc/src/main/xml/APPC_method_ansible_adapter_1.0_2.0.1.xml
@@ -4,12 +4,14 @@
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
+  Modifications Copyright (C) 2019 Orange
+  =============================================================================
   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.
@@ -28,12 +30,17 @@
             <parameter name='LocalParameters' value='`$LocalParameters`'/>
             <parameter name='EnvParameters' value='`$EnvParameters`'/>
             <parameter name='FileParameters' value='`$FileParameters`'/>
+            <parameter name='AutoNodeList' value='`$AutoNodeList`'/>
             <parameter name='NodeList' value='`$NodeList`'/>
             <parameter name='Timeout' value='`$Timeout`'/>
             <parameter name='Version' value='`$Version`'/>
             <parameter name='InventoryNames' value='`$InventoryNames`'/>
             <parameter name='PlaybookName' value='`$PlaybookName`'/>
             <parameter name='Action' value='`$Action`'/>
+            <parameter name='vnfc-name' value='`$request-parameters.vnfc-name`'/>
+            <parameter name='vnfc-type' value='`$request-parameters.vnfc-type`'/>
+            <parameter name='vserver-id' value='`$request-parameters.vserver-id`'/>
+            <parameter name='vf-module-id' value='`$request-parameters.vf-module-id`'/>
             <outcome value='failure'>
                 <return status='failure'>
                     <parameter name='output.status.code' value='200'/>