diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/component_factory.py | 2 | ||||
| -rw-r--r-- | core/pktfwd_controller.py | 7 | ||||
| -rw-r--r-- | core/pod_controller.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/core/component_factory.py b/core/component_factory.py index f13bfb5b..618c7f5a 100644 --- a/core/component_factory.py +++ b/core/component_factory.py @@ -81,6 +81,8 @@ def create_vswitch(deployment_scenario, vswitch_class, traffic, return VswitchControllerPtunP(deployment, vswitch_class, traffic) elif deployment.startswith("clean"): return VswitchControllerClean(deployment, vswitch_class, traffic) + elif deployment.startswith("pc"): + return VswitchControllerP2P(deployment, vswitch_class, traffic) else: raise RuntimeError("Unknown deployment scenario '{}'.".format(deployment)) diff --git a/core/pktfwd_controller.py b/core/pktfwd_controller.py index 363302c3..2b6a008c 100644 --- a/core/pktfwd_controller.py +++ b/core/pktfwd_controller.py @@ -33,8 +33,11 @@ class PktFwdController(object): self._deployment = deployment self._logger = logging.getLogger(__name__) self._pktfwd_class = pktfwd_class - self._pktfwd = pktfwd_class(guest=True if deployment == "pvp" and - settings.getValue('VNF') != "QemuPciPassthrough" else False) + if 'DummyFWD' in settings.getValue("PKTFWD") or 'pc' in deployment: + self._pktfwd = pktfwd_class() + else: + self._pktfwd = pktfwd_class(guest=True if deployment == "pvp" and + settings.getValue('VNF') != "QemuPciPassthrough" else False) self._logger.debug('Creation using %s', str(self._pktfwd_class)) def setup(self): diff --git a/core/pod_controller.py b/core/pod_controller.py index 109daa43..e522b823 100644 --- a/core/pod_controller.py +++ b/core/pod_controller.py @@ -44,7 +44,7 @@ class PodController(): self._pod_class = pod_class self._deployment = deployment.lower() self._pods = [] - if 'pcp' in self._deployment or 'p2p' in self._deployment: + if 'pcp' in self._deployment: pod_number = 1 elif 'pccp'in self._deployment: pod_number = 2 |