summaryrefslogtreecommitdiffstats
path: root/pomba/network-discovery
diff options
context:
space:
mode:
Diffstat (limited to 'pomba/network-discovery')
-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
5 files changed, 10 insertions, 3 deletions
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}