Merge Newton private changes

- Add interface mapping data to hiera
- Add support for VPP interfaces
- Continue bringing up interfaces even if one fails
- Change hiera to json format

List of commits: https://github.com/openstack/os-net-config/compare/stable/newton...trozet:stable/danube

Change-Id: If7a2c6119bf613f1fc8846237b077cd8f0e26015
Signed-off-by: Feng Pan <fpan@redhat.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py
index 438deef..b29bae4 100644
--- a/os_net_config/tests/test_objects.py
+++ b/os_net_config/tests/test_objects.py
@@ -993,3 +993,19 @@ class TestOvsDpdkBond(base.TestCase):
         self.assertEqual("vfio-pci", dpdk_port1.driver)
         iface2 = dpdk_port1.members[0]
         self.assertEqual("eth2", iface2.name)
+
+
+class TestVppInterface(base.TestCase):
+    def test_vpp_interface_from_json(self):
+        data = """{
+"type": "vpp_interface",
+"name": "em1",
+"uio_driver": "uio_pci_generic",
+"options": "vlan-strip-offload off"
+}
+"""
+
+        vpp_interface = objects.object_from_json(json.loads(data))
+        self.assertEqual("em1", vpp_interface.name)
+        self.assertEqual("uio_pci_generic", vpp_interface.uio_driver)
+        self.assertEqual("vlan-strip-offload off", vpp_interface.options)