Update brg topo activate

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

Former-commit-id: 0665236357387cf06005528796fbd3e83bd6af73

1 files changed, 2 insertions, 72 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 66266542..7536425a 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
@@ -136,8 +136,8 @@
                 <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-bearer-ip` " />

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

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

             </set>

@@ -203,76 +203,6 @@
                     </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.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip`"/>

-            </execute>

-            <set>

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

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

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

-                <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.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.vpp.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>

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

-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.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`"/>