Fixes from Integration 11-16

Issue-ID: SDNC-201
Change-Id: I0fce48872828e5c38b37588eae7c5a000099d96d
Signed-off-by: Brian Freeman <bf1936@att.com>

Former-commit-id: 65631026c8f90a2c24be8e7411882bb9599a3b87

1 files changed, 1 insertions, 162 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
index a263325a..29e7161f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
@@ -1,162 +1 @@
-[
-  {
-    "id":"39f3ae67.7e9242",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":186.66665649414062,
-    "y":111.66666412353516,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "a29ec69.164b938"
-      ]
-    ]
-  },
-  {
-    "id":"a29ec69.164b938",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "comments":"",
-    "xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs":1,
-    "x":282.90473556518555,
-    "y":172.61905479431152,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "4705cb34.a0c174"
-      ]
-    ]
-  },
-  {
-    "id":"4705cb34.a0c174",
-    "type":"method",
-    "name":"get-tunnelxconn-ar",
-    "xml":"<method rpc='get-tunnelxconn-ar' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":303.82152938842773,
-    "y":241.1904535293579,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "7864ada9.710574"
-      ]
-    ]
-  },
-  {
-    "id":"7864ada9.710574",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":237.14284896850586,
-    "y":351.19045209884644,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "2c32d527.ae06da",
-        "9e578822.5550a8"
-      ]
-    ]
-  },
-  {
-    "id":"9e578822.5550a8",
-    "type":"for",
-    "name":"for tmp.tunnel-ar",
-    "xml":"<for index='tunnelidx' start='0' end='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":421.66666412353516,
-    "y":359.9999370574951,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "4655d18f.1efdc"
-      ]
-    ]
-  },
-  {
-    "id":"2c32d527.ae06da",
-    "type":"get-resource",
-    "name":"get-resource tunnelxconn-ar",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources' pfx='tmp.tunnel-ar.data' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":499.99998474121094,
-    "y":301.33330726623535,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"4655d18f.1efdc",
-    "type":"switchNode",
-    "name":"switch consuming-service-instance-id match",
-    "xml":"<switch test='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id == $tmp.ar.consuming-service-instance-id`'>\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":706.3333587646484,
-    "y":358.9999713897705,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "d430e328.d45e6"
-      ]
-    ]
-  },
-  {
-    "id":"d430e328.d45e6",
-    "type":"success",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":900.3333625793457,
-    "y":299.99995613098145,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "bbaf2c6f.a5b81"
-      ]
-    ]
-  },
-  {
-    "id":"bbaf2c6f.a5b81",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1124.9999465942383,
-    "y":333.6666135787964,
-    "z":"e0aca357.6f32a",
-    "wires":[
-      [
-        "885aaec0.195b"
-      ]
-    ]
-  },
-  {
-    "id":"885aaec0.195b",
-    "type":"set",
-    "name":"set tmp.tunnelxconn-ar",
-    "xml":"<set>\n<parameter name='tmp.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />\n",
-    "comments":"",
-    "x":1310.6668128967285,
-    "y":330.3332872390747,
-    "z":"e0aca357.6f32a",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"7c853e9a.8e493","type":"dgstart","name":"DGSTART","outputs":1,"x":107,"y":102,"z":"58c3c7f.58ec038","wires":[["26c3a6ab.f0995a"]]},{"id":"26c3a6ab.f0995a","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111502","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":203.23807907104492,"y":162.95239067077637,"z":"58c3c7f.58ec038","wires":[["b685d1e2.1ad7"]]},{"id":"b685d1e2.1ad7","type":"method","name":"get-tunnelxconn-ar","xml":"<method rpc='get-tunnelxconn-ar' mode='sync'>\n","comments":"","outputs":1,"x":224.1548728942871,"y":231.52378940582275,"z":"58c3c7f.58ec038","wires":[["a60c7031.42946"]]},{"id":"a60c7031.42946","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":157.47619247436523,"y":341.5237879753113,"z":"58c3c7f.58ec038","wires":[["9497630e.f7b11","c2ddbd60.23e6b"]]},{"id":"c2ddbd60.23e6b","type":"for","name":"for tmp.tunnel-ar","xml":"<for index='tunnelidx' start='0' end='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n","comments":"","outputs":1,"x":342.00000762939453,"y":350.33327293395996,"z":"58c3c7f.58ec038","wires":[["9d4bdfb6.f48ca"]]},{"id":"9497630e.f7b11","type":"get-resource","name":"get-resource tunnelxconn-ar","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources' pfx='tmp.tunnel-ar.data' >\n","comments":"","outputs":1,"x":420.3333282470703,"y":291.6666431427002,"z":"58c3c7f.58ec038","wires":[[]]},{"id":"96f8fe76.c2dd","type":"switchNode","name":"switch consuming-service-instance-id match","xml":"<switch test='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id == $tmp.ar.consuming-service-instance-id`'>\n\n\n","comments":"","outputs":1,"x":619.6666870117188,"y":464.33331298828125,"z":"58c3c7f.58ec038","wires":[["747bb764.bbace8"]]},{"id":"747bb764.bbace8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":865.6666870117188,"y":284.3332824707031,"z":"58c3c7f.58ec038","wires":[["d3e839f4.8c4f08"]]},{"id":"d3e839f4.8c4f08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1045.3332901000977,"y":323.99994945526123,"z":"58c3c7f.58ec038","wires":[["a573ec9b.2c01b"]]},{"id":"a573ec9b.2c01b","type":"set","name":"set tmp.tunnelxconn-ar","xml":"<set>\n<parameter name='tmp.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />\n","comments":"","x":1231.000156402588,"y":320.66662311553955,"z":"58c3c7f.58ec038","wires":[]},{"id":"7eedec25.00f7f4","type":"set","name":"set","xml":"<set>\n<parameter name='tmp.printout.consuming-service-instance-id' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<parameter name='tmp.printout.index' value='`$tunnelidx`' />\n","comments":"","x":682,"y":332,"z":"58c3c7f.58ec038","wires":[]},{"id":"9d4bdfb6.f48ca","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":522,"y":395,"z":"58c3c7f.58ec038","wires":[["7eedec25.00f7f4","96f8fe76.c2dd"]]}]