NSB update

Refactored main NSB VNF classes accroding to class diagram

https://wiki.opnfv.org/display/yardstick/NSB+class+diagram

All the SampleVNFs have been separated and placed under
the SampleVNF class.

Added AutoConnectSSH to automatically create SSH conneciton on demand.

Added VnfdHelper class to wrap the VNFD dictionary in prepartion for
class-based modeling.

Extracted DpdkVnfSetupEnvHelper for DPDK based VNF setup.

Extracted Stats and other client config to ResourceHelper

Had to replace dict_key_flatten with deepgetitem due to Python 2.7
Jinja2 infinite recursion.

Change-Id: Ia8840e9c44cdbdf39aab6b02e6d2176b31937dc9
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/tests/unit/network_services/vnf_generic/test_vnfdgen.py b/tests/unit/network_services/vnf_generic/test_vnfdgen.py
index 6d5fb0c7a..be51e4a43 100644
--- a/tests/unit/network_services/vnf_generic/test_vnfdgen.py
+++ b/tests/unit/network_services/vnf_generic/test_vnfdgen.py
@@ -185,26 +185,21 @@ class TestVnfdGen(unittest.TestCase):
         generated_tp = vnfdgen.generate_vnfd(TRAFFIC_PROFILE_TPL, {"imix": {}})
         self.assertDictEqual(TRAFFIC_PROFILE, generated_tp)
 
-    def test_dict_flatten_empty_dict(self):
-        self.assertEqual(vnfdgen.dict_key_flatten({}), {})
+    def test_deepgetitem(self):
+        d = {'a': 1, 'b': 2}
+        self.assertEqual(vnfdgen.deepgetitem(d, "a"), 1)
 
     def test_dict_flatten_int(self):
         d = {'a': 1, 'b': 2}
-        self.assertEqual(vnfdgen.dict_key_flatten(d), d)
-
-    def test_dict_flatten_str(self):
-        d = {'a': "1", 'b': '2'}
-        self.assertEqual(vnfdgen.dict_key_flatten(d), d)
+        self.assertEqual(vnfdgen.deepgetitem(d, "a"), 1)
 
     def test_dict_flatten_list(self):
         d = {'a': 1, 'b': list(range(2))}
-        self.assertEqual(vnfdgen.dict_key_flatten(d),
-                         {'a': 1, 'b0': 0, 'b1': 1})
+        self.assertEqual(vnfdgen.deepgetitem(d, "b.0"), 0)
 
     def test_dict_flatten_dict(self):
         d = {'a': 1, 'b': {x: x for x in list(range(2))}}
-        self.assertEqual(vnfdgen.dict_key_flatten(d),
-                         {'a': 1, 'b.0': 0, 'b.1': 1})
+        self.assertEqual(vnfdgen.deepgetitem(d, "b.0"), 0)
 
     def test_generate_tp_single_var(self):
         """ Function to verify traffic profile generation with imix """