X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fresources%2Fport_chain.py;h=e1b3cbc5ebee9023539512d3c24bab3ff9b074b3;hb=a599cbd2811d03c2d71211b4dd12dec84dc1049b;hp=f727acfdf995da8398d323b712deaad500591bbb;hpb=eefcdb607b6ba0303213fdb8dc681faf069ea661;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/api/openstack/resources/port_chain.py b/src/emuvim/api/openstack/resources/port_chain.py
index f727acf..e1b3cbc 100644
--- a/src/emuvim/api/openstack/resources/port_chain.py
+++ b/src/emuvim/api/openstack/resources/port_chain.py
@@ -60,42 +60,47 @@ class PortChain(object):
         return compute.find_port_pair_by_name_or_id(port_pair_group.port_pairs[0])
 
     def install(self, compute):
-        for flow_classifier_id in self.flow_classifiers:
-            flow_classifier = compute.find_flow_classifier_by_name_or_id(
-                flow_classifier_id)
-            if flow_classifier:
-                pass
-                # TODO: for every flow classifier create match and pass it to
-                # setChain
 
         port_pair_chain = map(lambda port_pair_group_id: self._get_port_pair(port_pair_group_id, compute),
                               self.port_pair_groups)
         ingress_ports = map(lambda port_pair: port_pair.ingress, port_pair_chain)
         egress_ports = map(lambda port_pair: port_pair.ingress, port_pair_chain)
-        chain = zip(egress_ports, ingress_ports[1:])
+        chain_start = ingress_ports[0]
+        chain_rest = ingress_ports[1:]
+
+        for flow_classifier_id in self.flow_classifiers:
+            flow_classifier = compute.find_flow_classifier_by_name_or_id(flow_classifier_id)
+            if not flow_classifier:
+                raise RuntimeError("Unable to find flow_classifier %s" % flow_classifier_id)
+
+            port = compute.find_port_by_name_or_id(flow_classifier.logical_source_port)
+
+            chain = [(port, chain_start)] + zip(egress_ports, chain_rest)
 
-        for (egress_port, ingress_port) in chain:
-            server_egress = None
-            server_ingress = None
-            for server in compute.computeUnits.values():
-                if egress_port.name in server.port_names or egress_port.id in server.port_names:
-                    server_egress = server
-                if ingress_port.name in server.port_names or ingress_port.id in server.port_names:
-                    server_ingress = server
+            for (egress_port, ingress_port) in chain:
+                server_egress = None
+                server_ingress = None
+                for server in compute.computeUnits.values():
+                    if egress_port.name in server.port_names or egress_port.id in server.port_names:
+                        server_egress = server
+                    if ingress_port.name in server.port_names or ingress_port.id in server.port_names:
+                        server_ingress = server
 
-            if not server_egress:
-                raise RuntimeError("Neutron SFC: egress port %s not connected to any server." %
-                                   egress_port.name)
-            if not server_ingress:
-                raise RuntimeError("Neutron SFC: ingress port %s not connected to any server." %
-                                   ingress_port.name)
+                if not server_egress:
+                    raise RuntimeError("Neutron SFC: egress port %s not connected to any server." %
+                                       egress_port.name)
+                if not server_ingress:
+                    raise RuntimeError("Neutron SFC: ingress port %s not connected to any server." %
+                                       ingress_port.name)
 
-            compute.dc.net.setChain(
-                server_egress.name, server_ingress.name,
-                egress_port.intf_name, ingress_port.intf_name,
-                cmd="add-flow", cookie=self.cookie, priority=10, bidirectional=False,
-                monitor=False
-            )
+                compute.dc.net.setChain(
+                    server_egress.name, server_ingress.name,
+                    egress_port.intf_name, ingress_port.intf_name,
+                    match=flow_classifier.to_match(),
+                    mod_dl_dst=ingress_port.mac_address,
+                    cmd="add-flow", cookie=self.cookie, priority=10, bidirectional=False,
+                    monitor=False, skip_vlan_tag=True
+                )
 
     def uninstall(self, compute):
         # TODO: implement