Fixed service port create failure
Also enhanced service network and port codec and added more unit tests
Change-Id: I523acc49dc1472520bd15a47f9a591cd95297ea0
diff --git a/src/test/resources/org/opencord/cordvtn/codec/service-network-with-provider.json b/src/test/resources/org/opencord/cordvtn/codec/service-network-with-provider.json
deleted file mode 100644
index b017c07..0000000
--- a/src/test/resources/org/opencord/cordvtn/codec/service-network-with-provider.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "serviceNetwork": {
- "id": "B",
- "name": "B",
- "type": "private",
- "providers": [
- {
- "id": "A",
- "bidirectional": true
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/src/test/resources/org/opencord/cordvtn/codec/service-network.json b/src/test/resources/org/opencord/cordvtn/codec/service-network.json
index 9235f99..d7bf5a7 100644
--- a/src/test/resources/org/opencord/cordvtn/codec/service-network.json
+++ b/src/test/resources/org/opencord/cordvtn/codec/service-network.json
@@ -1,8 +1,16 @@
{
"serviceNetwork": {
- "id": "A",
- "name": "A",
- "type": "management_local",
- "providerNetworks": []
+ "id": "network_1",
+ "name": "network_1",
+ "type": "private",
+ "segment_id": 1,
+ "subnet": "192.168.0.0/24",
+ "service_ip": "192.168.0.1",
+ "providers": [
+ {
+ "id": "provider_1",
+ "bidirectional": true
+ }
+ ]
}
}
\ No newline at end of file
diff --git a/src/test/resources/org/opencord/cordvtn/codec/service-port.json b/src/test/resources/org/opencord/cordvtn/codec/service-port.json
new file mode 100644
index 0000000..c50454e
--- /dev/null
+++ b/src/test/resources/org/opencord/cordvtn/codec/service-port.json
@@ -0,0 +1,20 @@
+{
+ "servicePort": {
+ "id": "port-1",
+ "network_id": "network-1",
+ "name": "tap1",
+ "floating_address_pairs": [
+ {
+ "ip_address": "192.168.0.1",
+ "mac_address": "02:42:0a:06:01:01"
+ },
+ {
+ "ip_address": "192.168.0.2",
+ "mac_address": "02:42:0a:06:01:02"
+ }
+ ],
+ "ip_address": "10.0.0.1",
+ "mac_address": "00:00:00:00:00:01",
+ "vlan_id": 222
+ }
+}
\ No newline at end of file