From 4ba781b2b5e1547d6d06e4526f7e12ecddd35dfb Mon Sep 17 00:00:00 2001
From: Martin Klozik <martinx.klozik@intel.com>
Date: Mon, 5 Sep 2016 09:29:00 +0100
Subject: 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>
---
 core/vnf_controller.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core')

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)
-- 
cgit 1.2.3-korg