aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2017-10-31 19:16:09 +0530
committershashikanth.vh <shashikanth.vh@huawei.com>2017-10-31 19:16:14 +0530
commit736d5e4f0816ba90f0f3157ff380253bb966a344 (patch)
tree6f5496c6ece87b116e0b575250f81007dfd38ef6 /platform-logic/generic-resource-api/src/main
parentdacfab59cf41eaf95b3a87ec48124a1a51a21df7 (diff)
Fix underlay DG testing issue
Log record format is invalid, instead of using field1, field2, field3... actual name is used in parameter. changed names to field in parameter SDNC-157" target="_blank">https://jira.onap.org/browse/SDNC-157 Issue-Id: SDNC-157 Change-Id: Ibd9341e5f1bf48f8e08334bab86a53b31afb734a Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 4733411f591bb39f431b1135828b13d3f967e263
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml105
2 files changed, 70 insertions, 37 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index 35795625..3c64d532 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -1278,7 +1278,7 @@
"id": "acc5dbef.ee3348",
"type": "record",
"name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"Time\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"Method\" value=\"network-topology-operation-create\"/>\n<parameter name=\"SubMethod\" value=\"L3VPN-Config\"/>\n<parameter name=\"l3vpn_name\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"topology\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"site1_name\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"vpn-policy1-id\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"l3vpn.entry1-id\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"sna1_name\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"pe1_id\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"ac1_id\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"sna1_svlan\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"ac1-peer-ip\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"ac1-ip\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"ac1_protocol\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"sna1-route-ip-prefix\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"sna1-route-next-hop\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"peer1-ip\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"ac1_protocol_bgp_as\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"vrf1-id\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"site2_name\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"vpn-policy2-id\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"l3vpn.entry2-id\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"sna2_name\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"pe2_id\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"ac2_id\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"sna2_svlan\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"ac2-peer-ip\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"ac2-ip\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"ac2_protocol\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"sna2-route-ip-prefix\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"sna2-route-next-hop\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"peer2-ip\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"ac2_protocol_bgp_as\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"vrf2-id\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"af_type\" value=\"`$prop.l3vpn.af_type`\"/>\n",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.sna1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1-ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1-ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.sna2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2-ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2-ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>\n",
"comments": "",
"outputs": 1,
"x": 719,
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 d8c4a960..a04d924a 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
@@ -324,42 +324,75 @@
</switch>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
- <parameter name="Time" value="__TIMESTAMP__" />
- <parameter name="Method" value="network-topology-operation-create" />
- <parameter name="SubMethod" value="L3VPN-Config" />
- <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="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`" />
- <parameter name="ac1_id" value="`$prop.l3vpn.ac1_id`" />
- <parameter name="sna1_svlan" value="`$prop.l3vpn.sna1_svlan`" />
- <parameter name="ac1-peer-ip" value="`$prop.l3vpn.ac1-peer-ip`" />
- <parameter name="ac1-ip" value="`$prop.l3vpn.ac1-ip`" />
- <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="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="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`" />
- <parameter name="ac2_id" value="`$prop.l3vpn.ac2_id`" />
- <parameter name="sna2_svlan" value="`$prop.l3vpn.sna2_svlan`" />
- <parameter name="ac2-peer-ip" value="`$prop.l3vpn.ac2-peer-ip`" />
- <parameter name="ac2-ip" value="`$prop.l3vpn.ac2-ip`" />
- <parameter name="ac2_protocol" value="`$prop.l3vpn.ac2_protocol`" />
- <parameter name="sna2-route-ip-prefix" value="`$prop.l3vpn.sna2-route-ip-prefix`" />
- <parameter name="sna2-route-next-hop" value="`$prop.l3vpn.sna2-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="vrf2-id" value="`$prop.l3vpn.vrf2-id`" />
- <parameter name="af_type" value="`$prop.l3vpn.af_type`" />
+ <parameter name="field1" value="__TIMESTAMP__" />
+ <parameter name="field2" value="network-topology-operation-create" />
+ <parameter name="field3" value="L3VPN-Config" />
+ <parameter name="field4" value="`l3vpn.name`" />
+ <parameter name="field5" value="`$prop.l3vpn.name`" />
+ <parameter name="field6" value="`l3vpn.topology`" />
+ <parameter name="field7" value="`$prop.l3vpn.topology`" />
+ <parameter name="field8" value="`l3vpn.site1_name`" />
+ <parameter name="field9" value="`$prop.l3vpn.site1_name`" />
+ <parameter name="field10" value="`l3vpn.vpn-policy1-id`" />
+ <parameter name="field11" value="`$prop.l3vpn.vpn-policy1-id`" />
+ <parameter name="field12" value="`l3vpn.entry1-id`" />
+ <parameter name="field13" value="`$prop.l3vpn.entry1-id`" />
+ <parameter name="field14" value="`l3vpn.sna1_name`" />
+ <parameter name="field15" value="`$prop.l3vpn.sna1_name`" />
+ <parameter name="field16" value="`l3vpn.pe1_id`" />
+ <parameter name="field17" value="`$prop.l3vpn.pe1_id`" />
+ <parameter name="field18" value="`l3vpn.ac1_id`" />
+ <parameter name="field19" value="`$prop.l3vpn.ac1_id`" />
+ <parameter name="field20" value="`l3vpn.sna1_svlan`" />
+ <parameter name="field21" value="`$prop.l3vpn.sna1_svlan`" />
+ <parameter name="field22" value="`l3vpn.ac1-peer-ip`" />
+ <parameter name="field23" value="`$prop.l3vpn.ac1-peer-ip`" />
+ <parameter name="field24" value="`l3vpn.ac1-ip`" />
+ <parameter name="field25" value="`$prop.l3vpn.ac1-ip`" />
+ <parameter name="field26" value="`l3vpn.ac1_protocol`" />
+ <parameter name="field27" value="`$prop.l3vpn.ac1_protocol`" />
+ <parameter name="field28" value="`l3vpn.sna1-route-ip-prefix`" />
+ <parameter name="field29" value="`$prop.l3vpn.sna1-route-ip-prefix`" />
+ <parameter name="field30" value="`l3vpn.sna1-route-next-hop`" />
+ <parameter name="field31" value="`$prop.l3vpn.sna1-route-next-hop`" />
+ <parameter name="field32" value="`l3vpn.peer1-ip`" />
+ <parameter name="field33" value="`$prop.l3vpn.peer1-ip`" />
+ <parameter name="field34" value="`l3vpn.ac1_protocol_bgp_as`" />
+ <parameter name="field35" value="`$prop.l3vpn.ac1_protocol_bgp_as`" />
+ <parameter name="field36" value="`l3vpn.vrf1-id`" />
+ <parameter name="field37" value="`$prop.l3vpn.vrf1-id`" />
+ <parameter name="field38" value="`l3vpn.site2_name`" />
+ <parameter name="field39" value="`$prop.l3vpn.site2_name`" />
+ <parameter name="field40" value="`l3vpn.vpn-policy2-id`" />
+ <parameter name="field41" value="`$prop.l3vpn.vpn-policy2-id`" />
+ <parameter name="field42" value="`l3vpn.entry2-id`" />
+ <parameter name="field43" value="`$prop.l3vpn.entry2-id`" />
+ <parameter name="field44" value="`l3vpn.sna2_name`" />
+ <parameter name="field45" value="`$prop.l3vpn.sna2_name`" />
+ <parameter name="field46" value="`l3vpn.pe2_id`" />
+ <parameter name="field47" value="`$prop.l3vpn.pe2_id`" />
+ <parameter name="field48" value="`l3vpn.ac2_id`" />
+ <parameter name="field49" value="`$prop.l3vpn.ac2_id`" />
+ <parameter name="field50" value="`l3vpn.sna2_svlan`" />
+ <parameter name="field51" value="`$prop.l3vpn.sna2_svlan`" />
+ <parameter name="field52" value="`l3vpn.ac2-peer-ip`" />
+ <parameter name="field53" value="`$prop.l3vpn.ac2-peer-ip`" />
+ <parameter name="field54" value="`l3vpn.ac2-ip`" />
+ <parameter name="field55" value="`$prop.l3vpn.ac2-ip`" />
+ <parameter name="field56" value="`l3vpn.ac2_protocol`" />
+ <parameter name="field57" value="`$prop.l3vpn.ac2_protocol`" />
+ <parameter name="field58" value="`l3vpn.sna2-route-ip-prefix`" />
+ <parameter name="field59" value="`$prop.l3vpn.sna2-route-ip-prefix`" />
+ <parameter name="field60" value="`l3vpn.sna2-route-next-hop`" />
+ <parameter name="field61" value="`$prop.l3vpn.sna2-route-next-hop`" />
+ <parameter name="field62" value="`l3vpn.peer2-ip`" />
+ <parameter name="field63" value="`$prop.l3vpn.peer2-ip`" />
+ <parameter name="field64" value="`l3vpn.ac2_protocol_bgp_as`" />
+ <parameter name="field65" value="`$prop.l3vpn.ac2_protocol_bgp_as`" />
+ <parameter name="field66" value="`l3vpn.vrf2-id`" />
+ <parameter name="field67" value="`$prop.l3vpn.vrf2-id`" />
+ <parameter name="field68" value="`l3vpn.af_type`" />
+ <parameter name="field69" value="`$prop.l3vpn.af_type`" />
</record>
<switch test="`$prop.l3vpn.service-type`">
<outcome value="l3vpn-ipwan">