홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
2f74f2cc 1 parent e34f1102

fixed pipeline and onos-drivers for OLT connection 

Change-Id: I51bda2d1f937ba9bf0c3b480070e9c4844465500
Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
...@@ -51,6 +51,7 @@ import org.onosproject.net.flow.criteria.Criterion; ...@@ -51,6 +51,7 @@ import org.onosproject.net.flow.criteria.Criterion;
51 import org.onosproject.net.flow.criteria.EthTypeCriterion; 51 import org.onosproject.net.flow.criteria.EthTypeCriterion;
52 import org.onosproject.net.flow.criteria.IPProtocolCriterion; 52 import org.onosproject.net.flow.criteria.IPProtocolCriterion;
53 import org.onosproject.net.flow.criteria.PortCriterion; 53 import org.onosproject.net.flow.criteria.PortCriterion;
54 +import org.onosproject.net.flow.criteria.VlanIdCriterion;
54 import org.onosproject.net.flow.instructions.Instruction; 55 import org.onosproject.net.flow.instructions.Instruction;
55 import org.onosproject.net.flow.instructions.Instructions; 56 import org.onosproject.net.flow.instructions.Instructions;
56 import org.onosproject.net.flow.instructions.L2ModificationInstruction; 57 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
...@@ -226,6 +227,8 @@ public class OltPipeline extends AbstractHandlerBehaviour implements Pipeliner { ...@@ -226,6 +227,8 @@ public class OltPipeline extends AbstractHandlerBehaviour implements Pipeliner {
226 return; 227 return;
227 } 228 }
228 229
230 + Criterion innerVid = Criteria.matchVlanId(((VlanIdCriterion) innerVlan).vlanId());
231 +
229 FlowRule.Builder outer = DefaultFlowRule.builder() 232 FlowRule.Builder outer = DefaultFlowRule.builder()
230 .forDevice(deviceId) 233 .forDevice(deviceId)
231 .fromApp(appId) 234 .fromApp(appId)
...@@ -241,7 +244,7 @@ public class OltPipeline extends AbstractHandlerBehaviour implements Pipeliner { ...@@ -241,7 +244,7 @@ public class OltPipeline extends AbstractHandlerBehaviour implements Pipeliner {
241 .forTable(QQ_TABLE) 244 .forTable(QQ_TABLE)
242 .makePermanent() 245 .makePermanent()
243 .withPriority(fwd.priority()) 246 .withPriority(fwd.priority())
244 - .withSelector(buildSelector(inport, innerVlan)) 247 + .withSelector(buildSelector(inport, innerVid))
245 .withTreatment(buildTreatment(popAndRewrite.getRight(), 248 .withTreatment(buildTreatment(popAndRewrite.getRight(),
246 output)); 249 output));
247 250
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 impl="org.onosproject.driver.pipeline.OFDPA2Pipeline"/> 114 impl="org.onosproject.driver.pipeline.OFDPA2Pipeline"/>
115 </driver> 115 </driver>
116 <driver name="pmc-olt" extends="default" 116 <driver name="pmc-olt" extends="default"
117 - manufacturer="Big Switch Networks" hwVersion="ivs 0.5" swVersion="ivs 0.5"> 117 + manufacturer="PMC GPON Networks" hwVersion="PASffffffff v-1" swVersion="vOLT.*">
118 <behaviour api="org.onosproject.net.behaviour.Pipeliner" 118 <behaviour api="org.onosproject.net.behaviour.Pipeliner"
119 impl="org.onosproject.driver.pipeline.OltPipeline"/> 119 impl="org.onosproject.driver.pipeline.OltPipeline"/>
120 </driver> 120 </driver>
......