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, 169 insertions, 169 deletions

diff --git a/samples/vnf_samples/traffic_profiles/example.yaml b/samples/vnf_samples/traffic_profiles/example.yaml
index 71371995e..fc2501526 100644
--- a/samples/vnf_samples/traffic_profiles/example.yaml
+++ b/samples/vnf_samples/traffic_profiles/example.yaml
@@ -25,174 +25,174 @@ traffic_profile:
   # that specifies a range (e.g. ipv4 address, port)
 
 private:
-	- ipv4_1:
-	  outer_l2:
-		framesize:
-				64B: {{ get(imix_small, 12) }}
-				128B: {{get(imix_128B, 12) }}
-				256B: {{get(imix_256B, 12) }}
-				373b: {{ get(imix_373B, 12) }}
-				570B: {{get(imix_570B, 12) }}
-				1400B: {{get(imix_1400B, 12) }}
-				1518b: {{get(imix_1500B, 12) }}
-		srcmac: {{src_mac}} # xe0.local_mac
-		dstmac: {{dst_mac}} # xe0.dst_mac
-		QinQ:
-			S-VLAN:
-				id: {{ get(flow.s_vlan_range, "0") }}
-				priority: 0
-				cfi: 0
-			C-VLAN:
-				id: {{ get(flow.c_vlan_range, "0") }}
-				priority: 0
-				cfi: 0
-		mpls:
-			label: {{ get(flow.mpls_label, "0") }}
-
-		outer_l3v4:
-			proto: {{ get(flow.outer_proto, "udp") }},
-			srcip4: {{ get(flow.outer_srcip4, "1.1.1.1") }}
-			dstip4: {{ get(flow.outer_dstip4, "90.90.90.90") }}
-			ttl: 32
-			dscp:  {{ get(flow.tos, 0) }}
-
-		outer_l4:
-			srcport: {{ get(flow.outer_srcport, "3002") }}
-			dstport: {{ get(flow.outer_dstport, "3001") }}
-			vni: {{ get(flow.vxlan_vni, "2345") }} #optional
-			inner_l2: #optional
-			srcmac: {{ get(flow.inner_srcmac, "00:00:00:00:00:00") }}
-			dstmac: {{ get(flow.inner_dstmac, "00:00:00:00:00:00") }}
-
-		inner_l3v4: #optional
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip4: {{ get(flow.inner_srcip4, "1.1.1.1") }}
-			dstip4: {{ get(flow.inner_dstip4, "90.90.90.90") }}
-			ttl: 32
-			dscp:  {{ get(flow.inner_tos, 0) }}
-
-		inner_l3v6:
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip6: {{ get(flow.inner_srcip6, "2001::1") }}
-			dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
-			ttl: 32
-			tc: {{ get(flow.inner_tos, 0) }}
-
-		inner_l4:
-			srcport: {{ get(flow.inner_srcport, "3002") }}
-			dstport: {{ get(flow.inner_dstport, "3001") }}
-
-	- ipv6_2:
-		outer_l2:
-			framesize:
-					64B: {{ get(imix_small, 12) }}
-					128B: {{get(imix_128B, 12) }}
-					256B: {{get(imix_256B, 12) }}
-					373b: {{ get(imix_373B, 12) }}
-					570B: {{get(imix_570B, 12) }}
-					1400B: {{get(imix_1400B, 12) }}
-					1518b: {{get(imix_1500B, 12) }}
-			srcmac: {{src_mac}} # xe0.local_mac
-			dstmac: {{dst_mac}} # xe0.dst_mac
-			QinQ:
-				S-VLAN:
-					id: {{ get(flow.s_vlan_range, "0") }}
-					priority: 0
-					cfi: 0
-				C-VLAN:
-					id: {{ get(flow.c_vlan_range, "0") }}
-				priority: 0
-				cfi: 0
-			mpls:
-				label: {{ get(flow.mpls_label, "0") }}
-
-		outer_l3v6:
-			proto: {{ get(flow.outer_proto, "udp") }},
-			srcip6: {{ get(flow.outer_srcip6, "2001::1") }}
-			dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
-			ttl: 32
-			tc: {{ get(flow.outer_tos, 0) }}
-
-		outer_l4:
-			srcport: {{ get(flow.outer_srcport, "3002") }}
-			dstport: {{ get(flow.outer_dstport, "3001") }}
-			vni: {{ get(flow.vxlan_vni, "2345") }} #optional
-			inner_l2: #optional
-			srcmac: {{ get(flow.inner_srcmac, "00:00:00:00:00:00") }}
-			dstmac: {{ get(flow.inner_dstmac, "00:00:00:00:00:00") }}
-
-		inner_l3v4: #optional
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip4: {{ get(flow.inner_srcip4, "1.1.1.1") }}
-			dstip4: {{ get(flow.inner_dstip4, "90.90.90.90") }}
-			ttl: 32
-			dscp:  {{ get(flow.inner_tos, 0) }}
-
-		inner_l3v6:
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip6: {{ get(flow.inner_srcip6, "2001::1") }}
-			dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
-			ttl: 32
-			tc: {{ get(flow.inner_tos, 0) }}
-
-		inner_l4:
-			srcport: {{ get(flow.inner_srcport, "3002") }}
-			dstport: {{ get(flow.inner_dstport, "3001") }}
+    - ipv4_1:
+      outer_l2:
+        framesize:
+                64B: {{ get(imix_small, 12) }}
+                128B: {{get(imix_128B, 12) }}
+                256B: {{get(imix_256B, 12) }}
+                373b: {{ get(imix_373B, 12) }}
+                570B: {{get(imix_570B, 12) }}
+                1400B: {{get(imix_1400B, 12) }}
+                1518b: {{get(imix_1500B, 12) }}
+        srcmac: {{src_mac}} # xe0.local_mac
+        dstmac: {{dst_mac}} # xe0.dst_mac
+        QinQ:
+            S-VLAN:
+                id: {{ get(flow.s_vlan_range, "0") }}
+                priority: 0
+                cfi: 0
+            C-VLAN:
+                id: {{ get(flow.c_vlan_range, "0") }}
+                priority: 0
+                cfi: 0
+        mpls:
+            label: {{ get(flow.mpls_label, "0") }}
+
+        outer_l3v4:
+            proto: {{ get(flow.outer_proto, "udp") }},
+            srcip4: {{ get(flow.outer_srcip4, "1.1.1.1") }}
+            dstip4: {{ get(flow.outer_dstip4, "90.90.90.90") }}
+            ttl: 32
+            dscp:  {{ get(flow.tos, 0) }}
+
+        outer_l4:
+            srcport: {{ get(flow.outer_srcport, "3002") }}
+            dstport: {{ get(flow.outer_dstport, "3001") }}
+            vni: {{ get(flow.vxlan_vni, "2345") }} #optional
+            inner_l2: #optional
+            srcmac: {{ get(flow.inner_srcmac, "00:00:00:00:00:00") }}
+            dstmac: {{ get(flow.inner_dstmac, "00:00:00:00:00:00") }}
+
+        inner_l3v4: #optional
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip4: {{ get(flow.inner_srcip4, "1.1.1.1") }}
+            dstip4: {{ get(flow.inner_dstip4, "90.90.90.90") }}
+            ttl: 32
+            dscp:  {{ get(flow.inner_tos, 0) }}
+
+        inner_l3v6:
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip6: {{ get(flow.inner_srcip6, "2001::1") }}
+            dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
+            ttl: 32
+            tc: {{ get(flow.inner_tos, 0) }}
+
+        inner_l4:
+            srcport: {{ get(flow.inner_srcport, "3002") }}
+            dstport: {{ get(flow.inner_dstport, "3001") }}
+
+    - ipv6_2:
+        outer_l2:
+            framesize:
+                    64B: {{ get(imix_small, 12) }}
+                    128B: {{get(imix_128B, 12) }}
+                    256B: {{get(imix_256B, 12) }}
+                    373b: {{ get(imix_373B, 12) }}
+                    570B: {{get(imix_570B, 12) }}
+                    1400B: {{get(imix_1400B, 12) }}
+                    1518b: {{get(imix_1500B, 12) }}
+            srcmac: {{src_mac}} # xe0.local_mac
+            dstmac: {{dst_mac}} # xe0.dst_mac
+            QinQ:
+                S-VLAN:
+                    id: {{ get(flow.s_vlan_range, "0") }}
+                    priority: 0
+                    cfi: 0
+                C-VLAN:
+                    id: {{ get(flow.c_vlan_range, "0") }}
+                priority: 0
+                cfi: 0
+            mpls:
+                label: {{ get(flow.mpls_label, "0") }}
+
+        outer_l3v6:
+            proto: {{ get(flow.outer_proto, "udp") }},
+            srcip6: {{ get(flow.outer_srcip6, "2001::1") }}
+            dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
+            ttl: 32
+            tc: {{ get(flow.outer_tos, 0) }}
+
+        outer_l4:
+            srcport: {{ get(flow.outer_srcport, "3002") }}
+            dstport: {{ get(flow.outer_dstport, "3001") }}
+            vni: {{ get(flow.vxlan_vni, "2345") }} #optional
+            inner_l2: #optional
+            srcmac: {{ get(flow.inner_srcmac, "00:00:00:00:00:00") }}
+            dstmac: {{ get(flow.inner_dstmac, "00:00:00:00:00:00") }}
+
+        inner_l3v4: #optional
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip4: {{ get(flow.inner_srcip4, "1.1.1.1") }}
+            dstip4: {{ get(flow.inner_dstip4, "90.90.90.90") }}
+            ttl: 32
+            dscp:  {{ get(flow.inner_tos, 0) }}
+
+        inner_l3v6:
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip6: {{ get(flow.inner_srcip6, "2001::1") }}
+            dstip6: {{ get(flow.outer_dstip6, "2001::11") }}
+            ttl: 32
+            tc: {{ get(flow.inner_tos, 0) }}
+
+        inner_l4:
+            srcport: {{ get(flow.inner_srcport, "3002") }}
+            dstport: {{ get(flow.inner_dstport, "3001") }}
 
 public:
-	- ipv4_2:
-		outer_l2:
-			framesize:
-				64B: {{ get(imix_small, 12) }}
-				128B: {{get(imix_128B, 12) }}
-				256B: {{get(imix_256B, 12) }}
-				373b: {{ get(imix_373B, 12) }}
-				570B: {{get(imix_570B, 12) }}
-				1400B: {{get(imix_1400B, 12) }}
-				1518b: {{get(imix_1500B, 12) }}
-			srcmac: {{get(private.ipv4_1.dst_mac}} # xe0.local_mac
-			dstmac: {{get)private.ipv4_1.src_mac}} # xe0.dst_mac
-			QinQ:
-				S-VLAN:
-					id: {{ get(flow.s_vlan_range, "0") }}
-					priority: 0
-					cfi: 0
-				C-VLAN:
-					id: {{ get(flow.c_vlan_range, "0") }}
-					priority: 0
-					cfi: 0
-			mpls:
-				label: {{ get(flow.mpls_label, "0") }}
-
-		outer_l3v4:
-			proto: {{ get(flow.outer_proto, "udp") }},
-			srcip4: {{ get(private.ipv4_1.outer_l3v4.dstip4) }}
-			dstip4: {{ get(private.ipv4_1.outer_l3v4.srcip4) }}
-			ttl: 32
-			dscp:  {{ get(flow.tos, 0) }}
-
-		outer_l4:
-			srcport: {{ get(private.ipv4_1.outer_l4.dstport) }}
-			dstport: {{ get(private.ipv4_1.outer_l4.srcport) }}
-			vni: {{ get(flow.vxlan_vni, "2345") }} #optional
-			inner_l2: #optional
-				srcmac: {{ get(private.ipv4_1.outer_l4.inner_l2.dstmac) }}
-				dstmac: {{ get(private.ipv4_1.outer_l4.inner_l2.srcmac) }}
-
-		inner_l3v4: #optional
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip4: {{ get(private.ipv4_1.inner_l3v4.dstip4) }}
-			dstip4: {{ get(private.ipv4_1.inner_l3v4.srcip4) }}
-			ttl: 32
-			dscp:  {{ get(flow.inner_tos, 0) }}
-
-		inner_l3v6:
-			proto: {{ get(flow.inner_proto, "udp") }},
-			srcip6: {{ get(private.ipv4_1.inner_l3v6.dstip6) }}
-			dstip6: {{ get(private.ipv4_1.inner_l3v6.srcip6) }}
-			ttl: 32
-			tc: {{ get(flow.inner_tos, 0) }}
-
-		inner_l4:
-			srcport: {{ get(private.ipv4_1.inner_l4.dstport) }}
-			dstport: {{ get(private.ipv4_1.inner_l4.srcport) }}
+    - ipv4_2:
+        outer_l2:
+            framesize:
+                64B: {{ get(imix_small, 12) }}
+                128B: {{get(imix_128B, 12) }}
+                256B: {{get(imix_256B, 12) }}
+                373b: {{ get(imix_373B, 12) }}
+                570B: {{get(imix_570B, 12) }}
+                1400B: {{get(imix_1400B, 12) }}
+                1518b: {{get(imix_1500B, 12) }}
+            srcmac: {{get(private.ipv4_1.dst_mac}} # xe0.local_mac
+            dstmac: {{get)private.ipv4_1.src_mac}} # xe0.dst_mac
+            QinQ:
+                S-VLAN:
+                    id: {{ get(flow.s_vlan_range, "0") }}
+                    priority: 0
+                    cfi: 0
+                C-VLAN:
+                    id: {{ get(flow.c_vlan_range, "0") }}
+                    priority: 0
+                    cfi: 0
+            mpls:
+                label: {{ get(flow.mpls_label, "0") }}
+
+        outer_l3v4:
+            proto: {{ get(flow.outer_proto, "udp") }},
+            srcip4: {{ get(private.ipv4_1.outer_l3v4.dstip4) }}
+            dstip4: {{ get(private.ipv4_1.outer_l3v4.srcip4) }}
+            ttl: 32
+            dscp:  {{ get(flow.tos, 0) }}
+
+        outer_l4:
+            srcport: {{ get(private.ipv4_1.outer_l4.dstport) }}
+            dstport: {{ get(private.ipv4_1.outer_l4.srcport) }}
+            vni: {{ get(flow.vxlan_vni, "2345") }} #optional
+            inner_l2: #optional
+                srcmac: {{ get(private.ipv4_1.outer_l4.inner_l2.dstmac) }}
+                dstmac: {{ get(private.ipv4_1.outer_l4.inner_l2.srcmac) }}
+
+        inner_l3v4: #optional
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip4: {{ get(private.ipv4_1.inner_l3v4.dstip4) }}
+            dstip4: {{ get(private.ipv4_1.inner_l3v4.srcip4) }}
+            ttl: 32
+            dscp:  {{ get(flow.inner_tos, 0) }}
+
+        inner_l3v6:
+            proto: {{ get(flow.inner_proto, "udp") }},
+            srcip6: {{ get(private.ipv4_1.inner_l3v6.dstip6) }}
+            dstip6: {{ get(private.ipv4_1.inner_l3v6.srcip6) }}
+            ttl: 32
+            tc: {{ get(flow.inner_tos, 0) }}
+
+        inner_l4:
+            srcport: {{ get(private.ipv4_1.inner_l4.dstport) }}
+            dstport: {{ get(private.ipv4_1.inner_l4.srcport) }}