Updated flow capable models and affected code

[controller.git] / opendaylight / md-sal / flow-management-compatibility / src / main / java / org / opendaylight / controller / md / frm / compatibility / FlowConfigMapping.xtend

diff --git a/opendaylight/md-sal/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend b/opendaylight/md-sal/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend
index 602b626452b66be4678a727112515f58c59e1070..c567dc00973e6ac50f69e8c1bcccda23dfc4f586 100644 (file)
--- a/opendaylight/md-sal/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend
+++ b/opendaylight/md-sal/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FlowConfigMapping.xtend
@@ -16,16 +16,15 @@ import org.opendaylight.yangtools.yang.binding.Identifiable
 class FlowConfigMapping {
 
     static def toConfigurationFlow(FlowConfig sourceCfg) {
 class FlowConfigMapping {
 
     static def toConfigurationFlow(FlowConfig sourceCfg) {

-        val it = new FlowBuilder();

         val source = flowAdded(sourceCfg.flow);
         val source = flowAdded(sourceCfg.flow);

-
-        action = source.action;
+        val it = new FlowBuilder();
+        instructions = source.instructions;

         cookie = source.cookie;
         hardTimeout = source.hardTimeout
         idleTimeout = source.idleTimeout
         match = source.match
         node = source.node
         cookie = source.cookie;
         hardTimeout = source.hardTimeout
         idleTimeout = source.idleTimeout
         match = source.match
         node = source.node

-        key = new FlowKey(sourceCfg.name, node)
+        key = new FlowKey(sourceCfg.name,node);

         return it.build();
     }
 
         return it.build();
     }