aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2016-09-05 09:29:00 +0100
committerMartin Klozik <martinx.klozik@intel.com>2016-09-05 09:29:00 +0100
commit4ba781b2b5e1547d6d06e4526f7e12ecddd35dfb (patch)
tree343e644fb10ce93fa9d51b9651c71ba65761652f
parent6a56d40bcb2de85c22bc19af2527e9c9227f33e2 (diff)
multi VM: Fix p2p deployment
Revert enforced vsperf failure in case, that VnfController is used in scenario without VNFs. Instance of VnfController is created for all scenarios including p2p, so it must be prepared for it. JIRA: VSPERF-361 Change-Id: Icf6e88e7ea62044c09bb194c260ea878d6a197c9 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Bill Michalowski <bmichalo@redhat.com> Reviewed-by: Antonio Fischetti <antonio.fischetti@intel.com>
-rw-r--r--core/vnf_controller.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/vnf_controller.py b/core/vnf_controller.py
index 29700661..3e472f04 100644
--- a/core/vnf_controller.py
+++ b/core/vnf_controller.py
@@ -53,8 +53,9 @@ 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)