Update brg topo activate

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_brg-topology-operation-activate.xml

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 6626654..7536425 100644 (file)
--- 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`"/>\r
             </execute>\r
             <set>\r
-                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />\r
-                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` " />\r
+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` " />\r
+                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` " />\r
                 <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />\r
                 <parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />\r
             </set>\r
@@ -203,76 +203,6 @@
                     </return>\r
                 </outcome>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                <parameter name="source" value="`$prop.honeycomb.url`"/>\r
-                <parameter name="outputPath" value="tmp.honeycomb.url"/>\r
-                <parameter name="target" value="{honeycomb-instance-ip}"/>\r
-                <parameter name="replacement" value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip`"/>\r
-            </execute>\r
-            <set>\r
-                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` " />\r
-                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />\r
-                <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` " />\r
-                <parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />\r
-            </set>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-                <parameter name="source" value="`$prop.restapi.vpp-honeycomb`"/>\r
-                <parameter name="outputPath" value="tmp.vpp-honeycomb-url"/>\r
-                <parameter name="target" value="{tunnel-name}"/>\r
-                <parameter name="replacement" value="`$tmp.tunnel-name`"/>\r
-            </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`" />\r
-                <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\r
-                <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\r
-                <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\r
-                <parameter name='format' value='json' />\r
-                <parameter name='httpMethod' value='PUT' />\r
-                <parameter name="responsePrefix" value="honeycomb-vnf" />\r
-                <outcome value='success'>\r
-                    <block></block>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='not-found'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`" />\r
-                <parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />\r
-                <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\r
-                <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\r
-                <parameter name='format' value='json' />\r
-                <parameter name='httpMethod' value='PUT' />\r
-                <parameter name="responsePrefix" value="honeycomb-vnf" />\r
-                <outcome value='success'>\r
-                    <block></block>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='not-found'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
             <set>\r
                 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\r
                 <parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>\r