aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic')
-rw-r--r--platform-logic/datachange/pom.xml4
-rw-r--r--platform-logic/generic-resource-api/pom.xml4
-rw-r--r--platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json6
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml8
-rw-r--r--platform-logic/installer/pom.xml4
-rw-r--r--platform-logic/lcm/pom.xml4
-rw-r--r--platform-logic/pom.xml4
-rw-r--r--platform-logic/restapi-templates/pom.xml4
-rw-r--r--platform-logic/restconfapi-yang/pom.xml4
-rw-r--r--platform-logic/setup/pom.xml4
-rw-r--r--platform-logic/vnfapi/pom.xml4
11 files changed, 24 insertions, 26 deletions
diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index 56e4b882..ae4419f3 100644
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-datachange</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index ca1959c8..a7bf825a 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-generic-resource-api</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
index 380dfd00..d15b6f4c 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
@@ -579,7 +579,7 @@
"id": "384abebf.660182",
"type": "switchNode",
"name": "switch ActivateSiteInstance",
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n ",
+ "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n ",
"comments": "",
"outputs": 1,
"x": 1658.5078411102295,
@@ -1878,7 +1878,7 @@
"id": "e72e5636.3932b8",
"type": "set",
"name": "set IP params",
- "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",
+ "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",
"comments": "",
"x": 2257.29248046875,
"y": 1043.8992919921875,
@@ -1889,7 +1889,7 @@
"id": "413a8e72.8c216",
"type": "set",
"name": "set IP params",
- "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
+ "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
"comments": "",
"x": 2254.754150390625,
"y": 1158,
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
index 40b1896d..288dd5d9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
@@ -129,7 +129,7 @@
</block>
</outcome>
</switch>
- <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">
+ <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
<outcome value='true'>
<set>
<parameter name='tmp.siteVidx' value='`$idx`' />
@@ -346,11 +346,9 @@
<outcome value='true'>
<block atomic="true">
<set>
- <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />
- <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />
<parameter name='prop.wan.IpMode' value="static" />
+ <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />
<parameter name='prop.route.nextHopType' value="ip-address" />
- <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />
@@ -383,7 +381,7 @@
<outcome value='true'>
<block atomic="true">
<set>
- <parameter name='prop.wan.ip-address' value="" />
+ <parameter name='prop.wan.ipAddress' value="" />
<parameter name='prop.wan.prefixLength' value="" />
<parameter name='prop.wan.providerIpAddress' value="" />
<parameter name='prop.wan.IpMode' value="DHCP" />
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index a72fa3dd..de6500df 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index 22eb640c..923daf76 100644
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-lcm</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 6384115a..6ee01b36 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic</name>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 47efea15..37948603 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index 2cce173f..16f92af2 100644
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restconfapi-yang</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index d4c59ba6..c9d9c5f1 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index 66b87521..8b0c667e 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-vnfapi</artifactId>
- <version>1.5.1-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>