aboutsummaryrefslogtreecommitdiffstats
path: root/appc-directed-graph/appc-dgraph
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2019-11-29 16:16:28 +0100
committerTakamune Cho <takamune.cho@att.com>2019-12-09 23:54:29 +0000
commit0682bef2851542f431b5c86a1cad2a28f5479eee (patch)
tree6084d5cc6b82cbb2ab7565227bcd9b4ce7bf9ce4 /appc-directed-graph/appc-dgraph
parentcea67fafd905f169b8db5c4be0b47959b66c32e3 (diff)
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: I3d5b79ab6ff778116856b513612721a9637363df Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Issue-ID: APPC-1729
Diffstat (limited to 'appc-directed-graph/appc-dgraph')
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json6
-rw-r--r--appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
index e89142c08..85ea58ba8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json
@@ -146,7 +146,7 @@
"id": "92d97097.efde08",
"type": "execute",
"name": "execute Convert payload to DG Context ",
- "xml": "<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"EnvParameters,PlaybookName,Timeout,NodeList,FileParameters,InventoryNames\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />",
+ "xml": "<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$tmp.merge.mergedData`\" />\n<parameter name=\"isEscaped\" value=\"Y\" />\n<parameter name=\"blockKeys\" value=\"EnvParameters,PlaybookName,Timeout,NodeList,AutoNodeList,FileParameters,InventoryNames\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />",
"comments": "",
"outputs": 1,
"x": 612.6145477294922,
@@ -163,7 +163,7 @@
"id": "b26ef86f.518fa8",
"type": "set",
"name": "set Payload params ",
- "xml": "<set>\n<parameter name='PlaybookName' value='`$PlaybookName`' />\n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$url`'/>\n <parameter name='User' value='`$user`'/>\n <parameter name='Password' value='`$password`'/>\n <parameter name='EnvParameters' value='`$EnvParameters`'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n <parameter name='InventoryNames' value='`$InventoryNames`'/>\n <parameter name='FileParameters' value='`$FileParameters`'/>\n\n\n\n",
+ "xml": "<set>\n<parameter name='PlaybookName' value='`$PlaybookName`' />\n<parameter name='NodeList' value='`$NodeList`'/>\n<parameter name='AutoNodeList' value='`$AutoNodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='AgentUrl' value='`$url`'/>\n <parameter name='User' value='`$user`'/>\n <parameter name='Password' value='`$password`'/>\n <parameter name='EnvParameters' value='`$EnvParameters`'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n <parameter name='InventoryNames' value='`$InventoryNames`'/>\n <parameter name='FileParameters' value='`$FileParameters`'/>\n\n\n\n",
"comments": "",
"x": 463.9220733642578,
"y": 592.0113525390625,
@@ -329,7 +329,7 @@
"id": "833c47f4.4e765",
"type": "set",
"name": "set Payload params ",
- "xml": "<set>\n<parameter name='PlaybookName' value='`$block_PlaybookName`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='EnvParameters' value='`$block_EnvParameters`'/>\n<parameter name='Timeout' value='`$block_Timeout`'/>\n<parameter name='InventoryNames' value='`$block_InventoryNames`'/>\n<parameter name='FileParameters' value='`$block_FileParameters`'/>\n\n\n\n",
+ "xml": "<set>\n<parameter name='PlaybookName' value='`$block_PlaybookName`' />\n<parameter name='NodeList' value ='`$block_NodeList`'/>\n<parameter name='AutoNodeList' value ='`$block_AutoNodeList`'/>\n<parameter name='vnf_id' value='`$vnf-id`' />\n<parameter name='EnvParameters' value='`$block_EnvParameters`'/>\n<parameter name='Timeout' value='`$block_Timeout`'/>\n<parameter name='InventoryNames' value='`$block_InventoryNames`'/>\n<parameter name='FileParameters' value='`$block_FileParameters`'/>\n\n\n\n",
"comments": "",
"x": 612.4444732666016,
"y": 189.22222900390625,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json
index 838c8c467..d66047fac 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/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,