Fix underlay DG testing issues

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 7b6df3e..d7ee6d0 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -12,7 +12,7 @@
                             </set>\r
                         </outcome>\r
                     </switch>\r
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">\r
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">\r
                         <outcome value="true">\r
                             <set>\r
                                 <parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />\r
@@ -477,7 +477,7 @@
                 </outcome>\r
                 <outcome value="l3vpn-sptn">\r
                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                        <parameter name="templateFileName" value="$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'" />\r
+                        <parameter name="templateFileName" value="$prop.restapi.templateDir +'/sptn-l3vpn-template.json'" />\r
                         <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url" />\r
                         <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />\r
                         <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />\r
@@ -526,8 +526,6 @@
                 <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.l3vpn.network-id`" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />\r
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.l3vpn.network-id`" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />\r
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="underlay" />\r
             </save>\r
             <return status="success">\r
                 <parameter name="ack-final-indicator" value="Y" />\r