Fix underlay DG loading errors

*Remove duplicate parameter names
*Update 'error-message' parameter value

Change-Id: Ia68fc3d0b5c850aec4776adc83e725fef52c52a3
Issue-Id: SDNC-117
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: 04580d7eb6c59fdd613a8fea1d161e0ed7a46a1e

2 files changed, 23 insertions, 23 deletions

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 81ddee29..c2561f6b 100644
--- 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
@@ -11,14 +11,14 @@
                     <return status="failure">

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

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

-                        <parameter name="error-message" value="Network model is_bound_to_vpn=true but no vpn_binding is present" />

+                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />

                     </return>

                 </outcome>

                 <outcome value="Other">

                     <return status="failure">

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

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

-                        <parameter name="error-message" value="Unexpected error retrieving vpn binding" />

+                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />

                     </return>

                 </outcome>

             </get-resource>

@@ -319,7 +319,7 @@
                 <parameter name="l3vpn_name" value="`$prop.l3vpn.name`" />

                 <parameter name="topology" value="`$prop.l3vpn.topology`" />

                 <parameter name="site1_name" value="`$prop.l3vpn.site1_name`" />

-                <parameter name="vpn-policy1-id" value="`$prop.l3vpn.vpn-policy1-id}`" />

+                <parameter name="vpn-policy1-id" value="`$prop.l3vpn.vpn-policy1-id`" />

                 <parameter name="l3vpn.entry1-id" value="`$prop.l3vpn.entry1-id`" />

                 <parameter name="sna1_name" value="`$prop.l3vpn.sna1_name`" />

                 <parameter name="pe1_id" value="`$prop.l3vpn.pe1_id`" />

@@ -330,11 +330,11 @@
                 <parameter name="ac1_protocol" value="`$prop.l3vpn.ac1_protocol`" />

                 <parameter name="sna1-route-ip-prefix" value="`$prop.l3vpn.sna1-route-ip-prefix`" />

                 <parameter name="sna1-route-next-hop" value="`$prop.l3vpn.sna1-route-next-hop`" />

-                <parameter name="peer2-ip" value="`$prop.l3vpn.peer2-ip`" />

-                <parameter name="ac2_protocol_bgp_as" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />

+                <parameter name="peer1-ip" value="`$prop.l3vpn.peer1-ip`" />

+                <parameter name="ac1_protocol_bgp_as" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />

                 <parameter name="vrf1-id" value="`$prop.l3vpn.vrf1-id`" />

                 <parameter name="site2_name" value="`$prop.l3vpn.site2_name`" />

-                <parameter name="vpn-policy2-id" value="`$prop.l3vpn.vpn-policy2-id}`" />

+                <parameter name="vpn-policy2-id" value="`$prop.l3vpn.vpn-policy2-id`" />

                 <parameter name="l3vpn.entry2-id" value="`$prop.l3vpn.entry2-id`" />

                 <parameter name="sna2_name" value="`$prop.l3vpn.sna2_name`" />

                 <parameter name="pe2_id" value="`$prop.l3vpn.pe2_id`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 3af34c61..9c13bbf5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -34,7 +34,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -45,7 +45,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -56,7 +56,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -67,7 +67,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -78,7 +78,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -89,7 +89,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -100,7 +100,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -111,7 +111,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -122,7 +122,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -133,7 +133,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -144,7 +144,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -155,7 +155,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -166,7 +166,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -177,7 +177,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -188,7 +188,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -199,7 +199,7 @@
                                                             <return status="failure">

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

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

-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />

+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />

                                                             </return>

                                                         </outcome>

                                                     </switch>

@@ -308,4 +308,4 @@
             </switch>

         </block>

     </method>

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