Fix brg-topo DGs

1. Added get vg-mgmt-ip in brg-topo-activate
so that vg tunnel could be properple setup

2. Added get vbrg-wan-ip to brg-topo-deactivate
so that vxlan tunnels can be removed

3. Updated AA&I updates calls to include
correct brg variables for global-customer-id,
service-type and service-instance-id

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

Former-commit-id: becd9978df3428354646a48c2d106177f6477695

3 files changed, 152 insertions, 30 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 8a0333c2..5109fdd5 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
@@ -82,10 +82,7 @@
             </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"

+                    key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.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'>

@@ -136,7 +133,7 @@
             <set>

                 <parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />

             </set>

-            <call module='GENERIC-RESOURCE-API' rpc='get-vgmux-lan-ip' mode='sync' ></call>

+            <call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' ></call>

             <set>

                 <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />

             </set>

@@ -147,7 +144,7 @@
                 <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-data.brg-topology.brg-assignments.vbrg-wan-ip` " />

+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />

                 <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />

                 <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` " />

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

@@ -173,14 +170,14 @@
                     <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" />

+                        <parameter name="error-message" value="Error setting up vxlan tunnel" />

                     </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" />

+                        <parameter name="error-message" value="Error setting up vxlan tunnel" />

                     </return>

                 </outcome>

             </execute>

@@ -203,14 +200,14 @@
                     <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" />

+                        <parameter name="error-message" value="Error setting up bridge domain" />

                     </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" />

+                        <parameter name="error-message" value="Error setting up bridge domain" />

                     </return>

                 </outcome>

             </execute>

@@ -220,14 +217,54 @@
             <set>

                 <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />

             </set>

+            <set>

+                <parameter name='tmp.search.consuming-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />

+            </set>

+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >

+                <outcome value='success'>

+                    <for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >

+                        <switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>

+                            <outcome value='true'>

+                                <for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >

+                                    <for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >

+                                        <for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >

+                                            <switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>

+                                                <outcome value='true'>

+                                                    <set>

+                                                        <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />

+                                                    </set>

+                                                </outcome>

+                                            </switch>

+                                        </for>

+                                    </for>

+                                </for>

+                            </outcome>

+                        </switch>

+                    </for>

+                </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 getting GENERIC-RESOURCE-API:services" />

+                    </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 getting GENERIC-RESOURCE-API:services" />

+                    </return>

+                </outcome>

+            </get-resource>

             <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.vg-ip`"/>

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

             </execute>

             <set>

-                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` " />

+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />

                 <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />

                 <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` " />

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

@@ -253,14 +290,14 @@
                     <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" />

+                        <parameter name="error-message" value="Error setting up vxlan tunnel" />

                     </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" />

+                        <parameter name="error-message" value="Error setting up vxlan tunnel" />

                     </return>

                 </outcome>

             </execute>

@@ -279,14 +316,14 @@
                     <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" />

+                        <parameter name="error-message" value="Error setting up bridge domain" />

                     </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" />

+                        <parameter name="error-message" value="Error setting up bridge domain" />

                     </return>

                 </outcome>

             </execute>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index c242bf07..fdd868d2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -202,10 +202,7 @@
                         </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"

+                                key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"

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

                             <parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />

                             <parameter name="selflink" value="`$tmp.ar.self-link`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
index 40bfb673..0fda4176 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
@@ -82,10 +82,7 @@
             </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"

+                    key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.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="out-of-service-path" />

                 <outcome value='failure'>

@@ -129,6 +126,17 @@
                     </return>

                 </outcome>

             </execute>

+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key="SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address" pfx="tmp.brg-wan-ip" ></get-resource>

+            <set>

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

+            </set>

+            <set>

+                <parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />

+            </set>

+            <call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' ></call>

+            <set>

+                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />

+            </set>

             <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"/>

@@ -136,10 +144,7 @@
                 <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-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />

-                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-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` " />

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

             </set>

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

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

@@ -161,14 +166,97 @@
                     <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" />

+                        <parameter name="error-message" value="Error deleting vxlan tunnel" />

                     </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" />

+                        <parameter name="error-message" value="Error deleting vxlan tunnel" />

+                    </return>

+                </outcome>

+            </execute>

+            <set>

+                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />

+            </set>

+            <set>

+                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />

+            </set>

+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >

+                <outcome value='success'>

+                    <for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >

+                        <switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>

+                            <outcome value='true'>

+                                <for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >

+                                    <for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >

+                                        <for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >

+                                            <switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>

+                                                <outcome value='true'>

+                                                    <set>

+                                                        <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />

+                                                    </set>

+                                                </outcome>

+                                            </switch>

+                                        </for>

+                                    </for>

+                                </for>

+                            </outcome>

+                        </switch>

+                    </for>

+                </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 getting GENERIC-RESOURCE-API:services" />

+                    </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 getting GENERIC-RESOURCE-API:services" />

+                    </return>

+                </outcome>

+            </get-resource>

+            <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.vg-mgmt-ip`"/>

+            </execute>

+            <set>

+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />

+            </set>

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

+                <parameter name="source" value="`$prop.restapi.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='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='DELETE' />

+                <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 setting up vxlan tunnel" />

+                    </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 setting up vxlan tunnel" />

                     </return>

                 </outcome>

             </execute>