summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/component_factory.py9
-rw-r--r--core/vswitch_controller_p2p.py24
-rw-r--r--core/vswitch_controller_pvp.py21
-rw-r--r--core/vswitch_controller_pvvp.py25
4 files changed, 52 insertions, 27 deletions
diff --git a/core/component_factory.py b/core/component_factory.py
index 4da37fb7..21cdd61d 100644
--- a/core/component_factory.py
+++ b/core/component_factory.py
@@ -47,7 +47,7 @@ def create_traffic(traffic_type, trafficgen_class):
return TrafficControllerRFC2544(trafficgen_class)
-def create_vswitch(deployment_scenario, vswitch_class, bidir=True):
+def create_vswitch(deployment_scenario, vswitch_class, traffic):
"""Return a new IVSwitchController for the deployment_scenario.
The returned controller is configured with the given vSwitch class.
@@ -56,15 +56,16 @@ def create_vswitch(deployment_scenario, vswitch_class, bidir=True):
:param deployment_scenario: The deployment scenario name
:param vswitch_class: Reference to vSwitch class to be used.
+ :param traffic: Dictionary with traffic specific details
:return: IVSwitchController for the deployment_scenario
"""
deployment_scenario = deployment_scenario.lower()
if deployment_scenario.find("p2p") >= 0:
- return VswitchControllerP2P(vswitch_class)
+ return VswitchControllerP2P(vswitch_class, traffic)
elif deployment_scenario.find("pvp") >= 0:
- return VswitchControllerPVP(vswitch_class, bidir)
+ return VswitchControllerPVP(vswitch_class, traffic)
elif deployment_scenario.find("pvvp") >= 0:
- return VswitchControllerPVVP(vswitch_class, bidir)
+ return VswitchControllerPVVP(vswitch_class, traffic)
def create_vnf(deployment_scenario, vnf_class):
"""Return a new VnfController for the deployment_scenario.
diff --git a/core/vswitch_controller_p2p.py b/core/vswitch_controller_p2p.py
index 35600e1b..236a443a 100644
--- a/core/vswitch_controller_p2p.py
+++ b/core/vswitch_controller_p2p.py
@@ -33,7 +33,7 @@ class VswitchControllerP2P(IVswitchController):
_deployment_scenario: A string describing the scenario to set-up in the
constructor.
"""
- def __init__(self, vswitch_class):
+ def __init__(self, vswitch_class, traffic):
"""Initializes up the prerequisites for the P2P deployment scenario.
:vswitch_class: the vSwitch class to be used.
@@ -43,6 +43,7 @@ class VswitchControllerP2P(IVswitchController):
self._vswitch = vswitch_class()
self._deployment_scenario = "P2P"
self._logger.debug('Creation using ' + str(self._vswitch_class))
+ self._traffic = traffic.copy()
def setup(self):
"""Sets up the switch for p2p.
@@ -67,13 +68,22 @@ class VswitchControllerP2P(IVswitchController):
# table#1 - flows to route packets between ports goes here. The
# chosen port is communicated to subsequent tables by setting the
# metadata value to the egress port number
- flow = {'table':'1', 'priority':'1', 'in_port':'1',
- 'actions': ['write_actions(output:2)', 'write_metadata:2',
- 'goto_table:2']}
+
+ # configure flows according to the TC definition
+ flow_template = _FLOW_TEMPLATE.copy()
+ if self._traffic['flow_type'] == 'IP':
+ flow_template.update({'dl_type':'0x0800', 'nw_src':self._traffic['l3']['srcip'],
+ 'nw_dst':self._traffic['l3']['dstip']})
+
+ flow = flow_template.copy()
+ flow.update({'table':'1', 'priority':'1', 'in_port':'1',
+ 'actions': ['write_actions(output:2)', 'write_metadata:2',
+ 'goto_table:2']})
self._vswitch.add_flow(bridge, flow)
- flow = {'table':'1', 'priority':'1', 'in_port':'2',
- 'actions': ['write_actions(output:1)', 'write_metadata:1',
- 'goto_table:2']}
+ flow = flow_template.copy()
+ flow.update({'table':'1', 'priority':'1', 'in_port':'2',
+ 'actions': ['write_actions(output:1)', 'write_metadata:1',
+ 'goto_table:2']})
self._vswitch.add_flow(bridge, flow)
# Frame modification table. Frame modification flow rules are
diff --git a/core/vswitch_controller_pvp.py b/core/vswitch_controller_pvp.py
index b2337bd6..0c98cc7f 100644
--- a/core/vswitch_controller_pvp.py
+++ b/core/vswitch_controller_pvp.py
@@ -34,7 +34,7 @@ class VswitchControllerPVP(IVswitchController):
_deployment_scenario: A string describing the scenario to set-up in the
constructor.
"""
- def __init__(self, vswitch_class, bidir=False):
+ def __init__(self, vswitch_class, traffic):
"""Initializes up the prerequisites for the PVP deployment scenario.
:vswitch_class: the vSwitch class to be used.
@@ -43,7 +43,7 @@ class VswitchControllerPVP(IVswitchController):
self._vswitch_class = vswitch_class
self._vswitch = vswitch_class()
self._deployment_scenario = "PVP"
- self._bidir = bidir
+ self._traffic = traffic.copy()
self._logger.debug('Creation using ' + str(self._vswitch_class))
def setup(self):
@@ -63,17 +63,24 @@ class VswitchControllerPVP(IVswitchController):
(_, vport2_number) = self._vswitch.add_vport(bridge)
self._vswitch.del_flow(bridge)
- flow1 = add_ports_to_flow(_FLOW_TEMPLATE, phy1_number,
+
+ # configure flows according to the TC definition
+ flow_template = _FLOW_TEMPLATE.copy()
+ if self._traffic['flow_type'] == 'IP':
+ flow_template.update({'dl_type':'0x0800', 'nw_src':self._traffic['l3']['srcip'],
+ 'nw_dst':self._traffic['l3']['dstip']})
+
+ flow1 = add_ports_to_flow(flow_template, phy1_number,
vport1_number)
- flow2 = add_ports_to_flow(_FLOW_TEMPLATE, vport2_number,
+ flow2 = add_ports_to_flow(flow_template, vport2_number,
phy2_number)
self._vswitch.add_flow(bridge, flow1)
self._vswitch.add_flow(bridge, flow2)
- if self._bidir:
- flow3 = add_ports_to_flow(_FLOW_TEMPLATE, phy2_number,
+ if self._traffic['bidir']:
+ flow3 = add_ports_to_flow(flow_template, phy2_number,
vport2_number)
- flow4 = add_ports_to_flow(_FLOW_TEMPLATE, vport1_number,
+ flow4 = add_ports_to_flow(flow_template, vport1_number,
phy1_number)
self._vswitch.add_flow(bridge, flow3)
self._vswitch.add_flow(bridge, flow4)
diff --git a/core/vswitch_controller_pvvp.py b/core/vswitch_controller_pvvp.py
index 43cf8a35..c79ad9a3 100644
--- a/core/vswitch_controller_pvvp.py
+++ b/core/vswitch_controller_pvvp.py
@@ -34,7 +34,7 @@ class VswitchControllerPVVP(IVswitchController):
_deployment_scenario: A string describing the scenario to set-up in the
constructor.
"""
- def __init__(self, vswitch_class, bidir=False):
+ def __init__(self, vswitch_class, traffic):
"""Initializes up the prerequisites for the PVVP deployment scenario.
:vswitch_class: the vSwitch class to be used.
@@ -43,7 +43,7 @@ class VswitchControllerPVVP(IVswitchController):
self._vswitch_class = vswitch_class
self._vswitch = vswitch_class()
self._deployment_scenario = "PVVP"
- self._bidir = bidir
+ self._traffic = traffic.copy()
self._logger.debug('Creation using ' + str(self._vswitch_class))
def setup(self):
@@ -65,22 +65,29 @@ class VswitchControllerPVVP(IVswitchController):
(_, vport4_number) = self._vswitch.add_vport(bridge)
self._vswitch.del_flow(bridge)
- flow1 = add_ports_to_flow(_FLOW_TEMPLATE, phy1_number,
+
+ # configure flows according to the TC definition
+ flow_template = _FLOW_TEMPLATE.copy()
+ if self._traffic['flow_type'] == 'IP':
+ flow_template.update({'dl_type':'0x0800', 'nw_src':self._traffic['l3']['srcip'],
+ 'nw_dst':self._traffic['l3']['dstip']})
+
+ flow1 = add_ports_to_flow(flow_template, phy1_number,
vport1_number)
- flow2 = add_ports_to_flow(_FLOW_TEMPLATE, vport2_number,
+ flow2 = add_ports_to_flow(flow_template, vport2_number,
vport3_number)
- flow3 = add_ports_to_flow(_FLOW_TEMPLATE, vport4_number,
+ flow3 = add_ports_to_flow(flow_template, vport4_number,
phy2_number)
self._vswitch.add_flow(bridge, flow1)
self._vswitch.add_flow(bridge, flow2)
self._vswitch.add_flow(bridge, flow3)
- if self._bidir:
- flow4 = add_ports_to_flow(_FLOW_TEMPLATE, phy2_number,
+ if self._traffic['bidir']:
+ flow4 = add_ports_to_flow(flow_template, phy2_number,
vport4_number)
- flow5 = add_ports_to_flow(_FLOW_TEMPLATE, vport3_number,
+ flow5 = add_ports_to_flow(flow_template, vport3_number,
vport2_number)
- flow6 = add_ports_to_flow(_FLOW_TEMPLATE, vport1_number,
+ flow6 = add_ports_to_flow(flow_template, vport1_number,
phy1_number)
self._vswitch.add_flow(bridge, flow4)
self._vswitch.add_flow(bridge, flow5)