Update brg topo activate DG

brg-topology-operation-activate should
setup vxlan port/tunnel between vBRG
and vgMUX. This patch adds
the vcpe-vpp-bridge-domain.json template
and edits brg topo activate DG and
the generic-resource-api-dg.properties
to enable setup of the vxlan tunnel.

Issue-Id: SDNC-164
Change-Id: Ic5e473f16e2fb2e90149619accc857a64c3dbbd2
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Former-commit-id: 8235f3c0e35d379937e6e12130435aa76a5ac0bf

1 files changed, 215 insertions, 115 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index ad3c1436..5466d754 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
@@ -1,118 +1,218 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='brg-topology-operation-activate' mode='sync'>

-<block atomic="true"><set>

-<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

-<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

-

-

-</set><set>

-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'

- + $tmp.ar.allotted-resource-id

- + '/allotted-resource-data/brg-topology/'` " />

-

-</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >

-    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

-    <parameter name='contextPrefix' value='prop' />

-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

-    <parameter name="outputPath" value="tmp.ar-url"/>

-    <parameter name="target" value="{allotted-resource-id}"/>

-    <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

-    <parameter name='restapiUser' value='`$prop.controller.user`' />

-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

-    <parameter name='format' value='json' />

-    <parameter name='httpMethod' value='GET' />

-    <parameter name="responsePrefix" value="mdsal-ar" />

-

-<outcome value='success'>

-<block atomic="true">

-<set>

-<parameter name='bk-brg-ar' value='$mdsal-ar.' />

-</set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

-<outcome value='1'>

-<block atomic='true'>

-<set>

-<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

-<outcome value='Created'>

-<block>

-</block></outcome><outcome value='Other'>

-<block>

-</block></outcome></switch><set>

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

-

-</set></block></outcome></switch></block></outcome><outcome value='Other'>

-<block atomic="true">

-</block></outcome></execute><set>

-<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

-    <parameter name="outputPath" value="tmp.current-time" />

-

-</execute><set>

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

-</set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

-		resource="allotted-resource" 

-		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>

+    <method rpc='brg-topology-operation-activate' mode='sync'>

+        <block atomic="true">

+            <set>

+                <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

+                <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

+                <parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+            </set>

+            <set>

+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/brg-topology/'` " />

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >

+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

+                <parameter name='contextPrefix' value='prop' />

+            </execute>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

+                <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

+                <parameter name="outputPath" value="tmp.ar-url"/>

+                <parameter name="target" value="{allotted-resource-id}"/>

+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

+            </execute>

+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

+                <parameter name='restapiUser' value='`$prop.controller.user`' />

+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

+                <parameter name='format' value='json' />

+                <parameter name='httpMethod' value='GET' />

+                <parameter name="responsePrefix" value="mdsal-ar" />

+                <outcome value='success'>

+                    <block atomic="true">

+                        <set>

+                            <parameter name='bk-brg-ar' value='$mdsal-ar.' />

+                        </set>

+                        <switch test='`$mdsal-ar.brg-allotted-resource_length`'>

+                            <outcome value='1'>

+                                <block atomic='true'>

+                                    <set>

+                                        <parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+                                    </set>

+                                    <switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+                                        <outcome value='Created'>

+                                            <block></block>

+                                        </outcome>

+                                        <outcome value='Other'>

+                                            <block></block>

+                                        </outcome>

+                                    </switch>

+                                    <set>

+                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+                                    </set>

+                                </block>

+                            </outcome>

+                        </switch>

+                    </block>

+                </outcome>

+                <outcome value='Other'>

+                    <block atomic="true"></block>

+                </outcome>

+            </execute>

+            <set>

+                <parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+                <parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+                <parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+                <parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " />

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+                <parameter name="outputPath" value="tmp.current-time" />

+            </execute>

+            <set>

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+            </set>

+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"

+                    resource="allotted-resource"

+                    key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

 			service-subscription.service-type = $service-data.service-information.subscription-service-type AND

 			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND

 			allotted-resource.id = $tmp.ar.allotted-resource-id"

-        pfx='pfx' local-only='false' force='false'>

-	<parameter name="operational-status" value="in-service-path" />

-<outcome value='failure'>

-<return status='failure'>

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

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

-    <parameter name="error-message" value="AAI failed" />

-</return></outcome><outcome value='not-found'>

-<return status='failure'>

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

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

-    <parameter name="error-message" value="AAI failed" />

-</return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

-    <parameter name='restapiUser' value='`$prop.controller.user`' />

-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

-    <parameter name='format' value='json' />

-    <parameter name='httpMethod' value='PUT' />

-    <parameter name="responsePrefix" value="mdsal-ar" />

-

-<outcome value='success'>

-<block>

-</block></outcome><outcome value='failure'>

-<return status='failure'>

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

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

-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

-</return></outcome><outcome value='not-found'>

-<return status='failure'>

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

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

-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

-</return></outcome></execute><set>

-<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />

-<parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>

-<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

- + $brg-topology-operation-input.service-information.service-instance-id

- + '/service-data/service-topology/'`"/>

- 

-</set><return status='success'>

-<parameter name="ack-final-indicator" value="Y" />

-<parameter name="error-code" value="200" />

-<parameter name="error-message" value="`$error-message`" />

-</return></block></method></service-logic>
+                    pfx='pfx' local-only='false' force='false'>

+                <parameter name="operational-status" value="in-service-path" />

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="AAI failed" />

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="AAI failed" />

+                    </return>

+                </outcome>

+            </update>

+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

+                <parameter name='restapiUser' value='`$prop.controller.user`' />

+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

+                <parameter name='format' value='json' />

+                <parameter name='httpMethod' value='PUT' />

+                <parameter name="responsePrefix" value="mdsal-ar" />

+                <outcome value='success'>

+                    <block></block>

+                </outcome>

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+            </execute>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

+                <parameter name="source" value="`$prop.honeycomb.url`"/>

+                <parameter name="outputPath" value="tmp.honeycomb.url"/>

+                <parameter name="target" value="{honeycomb-instance-ip}"/>

+                <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>

+            </execute>

+            <set>

+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-id` " />

+                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` " />

+                <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />

+                <parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

+                <parameter name="source" value="`$prop.restapi.brg-vpp-honeycomb`"/>

+                <parameter name="outputPath" value="tmp.vpp-honeycomb-url"/>

+                <parameter name="target" value="{tunnel-name}"/>

+                <parameter name="replacement" value="`$tmp.tunnel-name`"/>

+            </execute>

+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.vxlan-tunnel.templatefile`" />

+                <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />

+                <parameter name='restapiUser' value='`$prop.honeycomb.user`' />

+                <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />

+                <parameter name='format' value='json' />

+                <parameter name='httpMethod' value='PUT' />

+                <parameter name="responsePrefix" value="honeycomb-vnf" />

+                <outcome value='success'>

+                    <block></block>

+                </outcome>

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+            </execute>

+            <set>

+                <parameter name='tmp.bridge-domain' value="bridge-domain-10" />

+                <parameter name='tmp.split-horizon-group' value="2" />

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.vpp-bridge-domain.templatefile`" />

+                <parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />

+                <parameter name='restapiUser' value='`$prop.honeycomb.user`' />

+                <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />

+                <parameter name='format' value='json' />

+                <parameter name='httpMethod' value='PUT' />

+                <parameter name="responsePrefix" value="honeycomb-vnf" />

+                <outcome value='success'>

+                    <block></block>

+                </outcome>

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

+                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+                    </return>

+                </outcome>

+            </execute>

+            <set>

+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />

+                <parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>

+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $brg-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>

+            </set>

+            <return status='success'>

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

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

+                <parameter name="error-message" value="`$error-message`" />

+            </return>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file