Merge "ixia: VLAN support without l3/l4 headers"

[vswitchperf.git] / core / vnf_controller.py

diff --git a/core/vnf_controller.py b/core/vnf_controller.py
index 2970066..78a2925 100644 (file)
--- a/core/vnf_controller.py
+++ b/core/vnf_controller.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Intel Corporation.
+# Copyright 2015-2017 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,10 +31,14 @@ class VnfController(object):
         _vnfs: A list of vnfs controlled by the controller.
     """
 
-    def __init__(self, deployment, vnf_class):
+    def __init__(self, deployment, vnf_class, extra_vnfs):
         """Sets up the VNF infrastructure based on deployment scenario
 
         :param vnf_class: The VNF class to be used.
+        :param extra_vnfs: The number of VNFs not involved in given
+            deployment scenario. It will be used to correctly expand
+            configuration values and initialize shared dirs. This parameter
+            is used in case, that additional VNFs are executed by TestSteps.
         """
         # reset VNF ID counter for each testcase
         IVnf.reset_vnf_counter()
@@ -53,29 +57,31 @@ class VnfController(object):
             else:
                 vm_number = 2
         else:
-            raise RuntimeError('Deployment {} is not supported by '
-                               'VnfController.'.format(self._deployment))
+            # VnfController is created for all deployments, including deployments
+            # without VNFs like p2p
+            vm_number = 0
 
-        if vm_number:
-            self._logger.debug('Check configuration for %s guests.', vm_number)
-            settings.check_vm_settings(vm_number)
+        if vm_number + extra_vnfs > 0:
+            self._logger.debug('Check configuration for %s guests.', vm_number + extra_vnfs)
+            settings.check_vm_settings(vm_number + extra_vnfs)
             # enforce that GUEST_NIC_NR is 1 or even number of NICs
             updated = False
             nics_nr = settings.getValue('GUEST_NICS_NR')
-            for index in range(len(nics_nr)):
-                if nics_nr[index] > 1 and nics_nr[index] % 2:
+            for index, value in enumerate(nics_nr):
+                if value > 1 and value % 2:
                     updated = True
-                    nics_nr[index] = int(nics_nr[index] / 2) * 2
+                    nics_nr[index] = int(value / 2) * 2
             if updated:
                 settings.setValue('GUEST_NICS_NR', nics_nr)
                 self._logger.warning('Odd number of NICs was detected. Configuration '
                                      'was updated to GUEST_NICS_NR = %s',
                                      settings.getValue('GUEST_NICS_NR'))
 
+        if vm_number:
             self._vnfs = [vnf_class() for _ in range(vm_number)]
 
-        self._logger.debug('__init__ ' + str(len(self._vnfs)) +
-                           ' VNF[s] with ' + ' '.join(map(str, self._vnfs)))
+            self._logger.debug('__init__ ' + str(len(self._vnfs)) +
+                               ' VNF[s] with ' + ' '.join(map(str, self._vnfs)))
 
     def get_vnfs(self):
         """Returns a list of vnfs controlled by this controller.