Merge "Add initial DG changes for underlay"

Former-commit-id: 6b5bcd001e9997e5ce4142c6c5818c767b59a94e

2 files changed, 115 insertions, 0 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
new file mode 100644
index 00000000..29ccea5b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -0,0 +1 @@
+[{"id":"12b79dd.fcf1ae2","type":"dgstart","name":"DGSTART","outputs":1,"x":80,"y":85.76192092895508,"z":"c6f0d3f1.455d9","wires":[["45289095.8730c"]]},{"id":"45289095.8730c","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":325.2857131958008,"y":85,"z":"c6f0d3f1.455d9","wires":[["54e5c542.fd5504"]]},{"id":"54e5c542.fd5504","type":"method","name":"method validate-network-input-parameters","xml":"<method rpc='validate-network-input-parameters' mode='sync'>\n","comments":"","outputs":1,"x":282.91668701171875,"y":160.0149383544922,"z":"c6f0d3f1.455d9","wires":[["4aa39923.928d98"]]},{"id":"4aa39923.928d98","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":566.9166946411133,"y":148.0149631500244,"z":"c6f0d3f1.455d9","wires":[["588fd95a.bd649","3dc5112.e6e5c6e"]]},{"id":"588fd95a.bd649","type":"switchNode","name":"switch  svc-action","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":847.9166946411133,"y":143.01494884490967,"z":"c6f0d3f1.455d9","wires":[["bea9cc02.adf488"]]},{"id":"bea9cc02.adf488","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1038.6309967041016,"y":144.01494979858398,"z":"c6f0d3f1.455d9","wires":[["c0743608.2f921"]]},{"id":"c0743608.2f921","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":1213.0595474243164,"y":143.01494216918945,"z":"c6f0d3f1.455d9","wires":[]},{"id":"3dc5112.e6e5c6e","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":148.91664123535156,"y":419.0149631500244,"z":"c6f0d3f1.455d9","wires":[["3acc66b9.f1e56a","69b2a932.e384a","48c30fe1.37ee2","3a0a08f8.ab065"]]},{"id":"3acc66b9.f1e56a","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":350.4167251586914,"y":419.0149631500244,"z":"c6f0d3f1.455d9","wires":[["3f05f182.7a112e"]]},{"id":"3f05f182.7a112e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":516.4167327880859,"y":419.0149631500244,"z":"c6f0d3f1.455d9","wires":[["4000702f.bf217"]]},{"id":"b0353d83.d95fc8","type":"for","name":"for loop i - Network input parameters","xml":"<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n","comments":"","outputs":1,"x":839.9165649414062,"y":457.01495361328125,"z":"c6f0d3f1.455d9","wires":[["4b65836a.da71a4"]]},{"id":"314ef392.5c55f4","type":"switchNode","name":"switch value","xml":"<switch test=\"`$tmp.value`\">\n","comments":"","outputs":1,"x":1434.9166259765625,"y":831.0149536132812,"z":"c6f0d3f1.455d9","wires":[["43c9362d.7e85f8"]]},{"id":"43c9362d.7e85f8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1651.9165992736816,"y":830.0149593353271,"z":"c6f0d3f1.455d9","wires":[["ca90525c.72c9e"]]},{"id":"ca90525c.72c9e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n","comments":"","x":1830.345314025879,"y":831.0149593353271,"z":"c6f0d3f1.455d9","wires":[]},{"id":"69b2a932.e384a","type":"outcome","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":356.9999771118164,"y":495.76191806793213,"z":"c6f0d3f1.455d9","wires":[[]]},{"id":"48c30fe1.37ee2","type":"outcome","name":"delete","xml":"<outcome value='delete'>\n","comments":"","outputs":1,"x":343.5715103149414,"y":551.0478391647339,"z":"c6f0d3f1.455d9","wires":[[]]},{"id":"3a0a08f8.ab065","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":345.6190757751465,"y":606.9047303199768,"z":"c6f0d3f1.455d9","wires":[["1c01820.787e0fe"]]},{"id":"1c01820.787e0fe","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n","comments":"","x":499.1906509399414,"y":609.5238742828369,"z":"c6f0d3f1.455d9","wires":[]},{"id":"4b65836a.da71a4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":717.9999389648438,"y":603.7619018554688,"z":"c6f0d3f1.455d9","wires":[["c0a12daa.de711","79c7c0f2.75db1","70c07e94.b958b"]]},{"id":"4000702f.bf217","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":472,"y":307,"z":"c6f0d3f1.455d9","wires":[["7fc21ed9.84ecc","2b594f42.596858"]]},{"id":"7fc21ed9.84ecc","type":"other","name":"CreateNetworkInstance","xml":"<outcome value='CreateNetworkInstance'>","comments":"","outputs":1,"x":738,"y":266,"z":"c6f0d3f1.455d9","wires":[["b93efadc.2a7b98"]]},{"id":"2b594f42.596858","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":692,"y":316,"z":"c6f0d3f1.455d9","wires":[["38f5f946.300656"]]},{"id":"38f5f946.300656","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=assign\" />\n","comments":"","x":861,"y":316,"z":"c6f0d3f1.455d9","wires":[]},{"id":"b93efadc.2a7b98","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":963,"y":255,"z":"c6f0d3f1.455d9","wires":[["b0353d83.d95fc8"]]},{"id":"2b9e6137.bb0cbe","type":"comment","name":"TODO: need to identify underlay or overlay","info":"","comments":"","x":969,"y":219,"z":"c6f0d3f1.455d9","wires":[]},{"id":"c0a12daa.de711","type":"set","name":"clear tmp-data","xml":"<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n","comments":"","x":910,"y":558,"z":"c6f0d3f1.455d9","wires":[]},{"id":"79c7c0f2.75db1","type":"set","name":"set tmp-data","xml":"<set>\n<parameter name='tmp.name' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'\"/>\n<parameter name='tmp.value' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'\"/>\n","comments":"","x":899,"y":648,"z":"c6f0d3f1.455d9","wires":[]},{"id":"70c07e94.b958b","type":"switchNode","name":"switch name","xml":"<switch test=\"'$tmp.name'\">\n","comments":"","outputs":1,"x":878,"y":742,"z":"c6f0d3f1.455d9","wires":[["b4dc69ff.a7ed1","bbb21dd0.0748a","646ea6b1.a2f9c8","439d167a.8c5ac","c1518ab4.108de8","b9d1292c.a326b","2a37f01.a563d1","1df27ff7.9e57b8","eb7c110.2f93df","f3eead68.9da5e","6b17cb91.28e614","3b3dd1c9.f1275e","6e7d7d1.8e50d04","e757b031.dd60f8","c7f4e328.7b4c7","55fe09c4.76bd78","5b95ca17.0b84a4"]]},{"id":"b4dc69ff.a7ed1","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1159,"y":1365,"z":"c6f0d3f1.455d9","wires":[["72bd50f1.643c"]]},{"id":"72bd50f1.643c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n","comments":"","x":1334,"y":1364,"z":"c6f0d3f1.455d9","wires":[]},{"id":"bbb21dd0.0748a","type":"other","name":"name","xml":"<outcome value='name'>","comments":"","outputs":1,"x":1136,"y":487,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"646ea6b1.a2f9c8","type":"other","name":"service-type","xml":"<outcome value='service-type'>","comments":"","outputs":1,"x":1139,"y":554,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"2a37f01.a563d1","type":"other","name":"sna2_name","xml":"<outcome value='sna2_name'>","comments":"","outputs":1,"x":1143,"y":783,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"439d167a.8c5ac","type":"other","name":"site1-name","xml":"<outcome value='site1-name'>","comments":"","outputs":1,"x":1140,"y":615,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"c1518ab4.108de8","type":"other","name":"site2-name","xml":"<outcome value='site2-name'>","comments":"","outputs":1,"x":1136,"y":672,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"b9d1292c.a326b","type":"other","name":"sna1_name","xml":"<outcome value='sna1_name'>","comments":"","outputs":1,"x":1139,"y":729,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"1df27ff7.9e57b8","type":"other","name":"pe1_id","xml":"<outcome value='pe1_id'>","comments":"","outputs":1,"x":1143,"y":834,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"eb7c110.2f93df","type":"other","name":"pe2_id","xml":"<outcome value='pe2_id'>","comments":"","outputs":1,"x":1146,"y":882,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"f3eead68.9da5e","type":"other","name":"ac1-id","xml":"<outcome value='ac1-id'>","comments":"","outputs":1,"x":1151,"y":931,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"6b17cb91.28e614","type":"other","name":"ac2-id","xml":"<outcome value='ac2-id'>","comments":"","outputs":1,"x":1153,"y":986,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"3b3dd1c9.f1275e","type":"other","name":"ac1-ip","xml":"<outcome value='ac1-ip'>","comments":"","outputs":1,"x":1153,"y":1038,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"6e7d7d1.8e50d04","type":"other","name":"ac2-ip","xml":"<outcome value='ac2-ip'>","comments":"","outputs":1,"x":1155,"y":1099,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"e757b031.dd60f8","type":"other","name":"ac1_peer_ip","xml":"<outcome value='ac1_peer_ip'>","comments":"","outputs":1,"x":1157,"y":1149,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"c7f4e328.7b4c7","type":"other","name":"ac2_peer_ip","xml":"<outcome value='ac2_peer_ip'>","comments":"","outputs":1,"x":1153,"y":1197,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"55fe09c4.76bd78","type":"other","name":"ac1_svlan","xml":"<outcome value='ac1_svlan'>","comments":"","outputs":1,"x":1155,"y":1250,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]},{"id":"5b95ca17.0b84a4","type":"other","name":"ac2_svlan","xml":"<outcome value='ac2_svlan'>","comments":"","outputs":1,"x":1157,"y":1311,"z":"c6f0d3f1.455d9","wires":[["314ef392.5c55f4"]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
new file mode 100644
index 00000000..e865258c
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -0,0 +1,114 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='validate-network-input-parameters' mode='sync'>

+<block atomic="true"><switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />

+</return></outcome></switch><switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>

+<outcome value='assign'>

+<block atomic="true"><switch test='`$network-topology-operation-input.request-information.request-action`'>

+<outcome value='CreateNetworkInstance'><block atomic="true"><for index="i" start="0" end="`$network-topology-information.network-request-input.network-input-parameters.param_length`">

+<block>

+<set>

+<parameter name='tmp.name' value='' />

+<parameter name='tmp.value' value='' />

+</set><set>

+<parameter name='tmp.name' value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'"/>

+<parameter name='tmp.value' value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'"/>

+</set><switch test="'$tmp.name'">

+<outcome value='name'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='service-type'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='site1-name'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='site2-name'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='sna1_name'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='sna2_name'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='pe1_id'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='pe2_id'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac1-id'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac2-id'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac1-ip'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac2-ip'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac1_peer_ip'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac2_peer_ip'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac1_svlan'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value='ac2_svlan'><switch test="`$tmp.value`">

+<outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+</return></outcome></switch></outcome><outcome value=''><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />

+</return></outcome></switch></block></for></block></outcome><outcome value='Other'><return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="request-information.request-action is required to be CreateNetworkInstance for svc-action=assign" />

+</return></outcome></switch></block></outcome><outcome value='deactivate'>

+</outcome><outcome value='delete'>

+</outcome><outcome value='Other'>

+<return status='failure'>

+	<parameter name='ack-final' value='Y'/>

+	<parameter name="error-code" value="500" />

+    <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />

+</return></outcome></switch></block></method></service-logic>
\ No newline at end of file