- if deployment_scenario.find("p2p") >= 0:
- return VswitchControllerP2P(vswitch_class)
- elif deployment_scenario.find("pvp") >= 0:
- return VswitchControllerPVP(vswitch_class)
-
-def create_vnf(deployment_scenario, vnf_class):
- """Return a new IVnfController for the deployment_scenario.
+ if deployment_scenario.startswith("p2p"):
+ return VswitchControllerP2P(vswitch_class, traffic)
+ elif deployment_scenario.startswith("pvp"):
+ return VswitchControllerPXP(deployment_scenario, vswitch_class, traffic)
+ elif deployment_scenario.startswith("pvvp"):
+ return VswitchControllerPXP(deployment_scenario, vswitch_class, traffic)
+ elif deployment_scenario.startswith("pvpv"):
+ return VswitchControllerPXP(deployment_scenario, vswitch_class, traffic)
+ elif deployment_scenario.startswith("op2p"):
+ return VswitchControllerOP2P(vswitch_class, traffic, tunnel_operation)
+ elif deployment_scenario.startswith("ptunp"):
+ return VswitchControllerPtunP(vswitch_class, traffic)
+ elif deployment_scenario.startswith("clean"):
+ return VswitchControllerClean(vswitch_class, traffic)
+ else:
+ raise RuntimeError("Unknown deployment scenario '{}'.".format(deployment_scenario))
+
+
+def create_vnf(deployment_scenario, vnf_class, extra_vnfs):
+ """Return a new VnfController for the deployment_scenario.