summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorm Traxler <normant@amdocs.com>2019-02-12 15:57:40 +0000
committerNorm Traxler <normant@amdocs.com>2019-02-12 20:00:59 +0000
commitdaf874925d0e9fe6f77c7033dc8756b302f799e1 (patch)
treeee62966a1b16130ea804c6ba373f2aa61e66beca
parentd8850d592f42d16a7d3d8d0c4ae1c64badf0b439 (diff)
Update pomba versioning for Dublin
Issue-ID: SDNC-637 Moving version Back to the Future Note: 1.4.2 is used for Casablanca release, so moving ahead to 1.5.0 Adding port description attribute Change-Id: I4b5526b1151603a1872df1cc6584ba0810685b0c Signed-off-by: Norm Traxler <normant@amdocs.com>
-rw-r--r--pomba/network-discovery-api/pom.xml2
-rw-r--r--pomba/network-discovery-api/version.properties2
-rw-r--r--pomba/network-discovery/config/jolt/port.json1
-rw-r--r--pomba/network-discovery/pom.xml2
-rw-r--r--pomba/network-discovery/src/test/resources/jolt/port-expected.json6
-rw-r--r--pomba/network-discovery/src/test/resources/jolt/port-input.json2
-rw-r--r--pomba/network-discovery/version.properties2
-rw-r--r--pomba/pom.xml2
-rw-r--r--pomba/service-decomposition/pom.xml2
-rw-r--r--pomba/service-decomposition/version.properties2
-rw-r--r--pomba/version.properties2
11 files changed, 16 insertions, 9 deletions
diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index 2e6a470..2bd2139 100644
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<groupId>org.onap.sdnc.apps.pomba</groupId>
<artifactId>network-discovery-api</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Network Discovery API</name>
<dependencies>
diff --git a/pomba/network-discovery-api/version.properties b/pomba/network-discovery-api/version.properties
index a254b21..99af342 100644
--- a/pomba/network-discovery-api/version.properties
+++ b/pomba/network-discovery-api/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
+minor=5
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/pomba/network-discovery/config/jolt/port.json b/pomba/network-discovery/config/jolt/port.json
index 99597b5..b702dcd 100644
--- a/pomba/network-discovery/config/jolt/port.json
+++ b/pomba/network-discovery/config/jolt/port.json
@@ -6,6 +6,7 @@
"id": "id",
"name": "name",
"admin_state_up": "tempList[].adminStateUp",
+ "description" : "tempList[].description",
"mac_address" : "tempList[].macAddress"
}
}
diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index 2ea5b48..2b5a2fc 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<groupId>org.onap.sdnc.apps.pomba</groupId>
<artifactId>pomba</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pomba/network-discovery/src/test/resources/jolt/port-expected.json b/pomba/network-discovery/src/test/resources/jolt/port-expected.json
index 33f6dc1..772933b 100644
--- a/pomba/network-discovery/src/test/resources/jolt/port-expected.json
+++ b/pomba/network-discovery/src/test/resources/jolt/port-expected.json
@@ -12,6 +12,12 @@
"status" : "ok"
}
}, {
+ "name" : "description",
+ "value" : "Port description",
+ "dataQuality" : {
+ "status" : "ok"
+ }
+ }, {
"name" : "macAddress",
"value" : "fa:16:3e:ff:f7:af",
"dataQuality" : {
diff --git a/pomba/network-discovery/src/test/resources/jolt/port-input.json b/pomba/network-discovery/src/test/resources/jolt/port-input.json
index 7e3e59b..874abc9 100644
--- a/pomba/network-discovery/src/test/resources/jolt/port-input.json
+++ b/pomba/network-discovery/src/test/resources/jolt/port-input.json
@@ -2,7 +2,7 @@
"port": {
"status": "ACTIVE",
"binding:host_id": "Setup-D2-OTT-A-Master",
- "description": "",
+ "description": "Port description",
"allowed_address_pairs": [],
"tags": [],
"extra_dhcp_opts": [],
diff --git a/pomba/network-discovery/version.properties b/pomba/network-discovery/version.properties
index a254b21..99af342 100644
--- a/pomba/network-discovery/version.properties
+++ b/pomba/network-discovery/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
+minor=5
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/pomba/pom.xml b/pomba/pom.xml
index bb794a6..6bff075 100644
--- a/pomba/pom.xml
+++ b/pomba/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<groupId>org.onap.sdnc.apps.pomba</groupId>
<artifactId>pomba</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/pomba/service-decomposition/pom.xml b/pomba/service-decomposition/pom.xml
index 79b1980..e8a3c0d 100644
--- a/pomba/service-decomposition/pom.xml
+++ b/pomba/service-decomposition/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<groupId>org.onap.sdnc.apps.pomba</groupId>
<artifactId>pomba</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pomba/service-decomposition/version.properties b/pomba/service-decomposition/version.properties
index a254b21..99af342 100644
--- a/pomba/service-decomposition/version.properties
+++ b/pomba/service-decomposition/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
+minor=5
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/pomba/version.properties b/pomba/version.properties
index a254b21..99af342 100644
--- a/pomba/version.properties
+++ b/pomba/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
+minor=5
patch=0
base_version=${major}.${minor}.${patch}