Merge "Setup hugepages on SA host(sriov, ovs_dpdk)"

diff --cc yardstick/benchmark/contexts/standalone/ovs_dpdk.py
Simple merge

diff --cc yardstick/network_services/vnf_generic/vnf/sample_vnf.py
Simple merge

diff --cc yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
index a03d908,707d452..190e83d
--- 1/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
--- 2/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
+++ b/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
@@@ -389,8 -385,10 +385,10 @@@ class OvsDpdkContextTestCase(unittest.T
          self.ovs_dpdk._enable_interfaces(0, ["private_0"], 'test')
          mock_add_ovs_interface.assert_called_once_with(
              'fake_path', 0, self.NETWORKS['private_0']['vpci'],
 -            self.NETWORKS['private_0']['mac'], 'test')
 +            self.NETWORKS['private_0']['mac'], 'test', 1)
  
+     @mock.patch.object(ovs_dpdk.OvsDpdkContext, '_check_hugepages')
+     @mock.patch.object(common_utils, 'setup_hugepages')
      @mock.patch.object(model.StandaloneContextHelper, 'check_update_key')
      @mock.patch.object(model.Libvirt, 'write_file')
      @mock.patch.object(model.Libvirt, 'build_vm_xml')

diff --cc yardstick/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py
Simple merge