mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 02:11:38 +02:00
Code Issues Projects Releases Wiki Activity

Fixed ECMP demo pipeconf

Browse Source 
Change-Id: I944ccceecb0053b2b421213b844912036a72c4c6
This commit is contained in:
Carmelo Cascone 2017-08-24 13:14:53 +02:00
parent b10194cd64
commit 9f760a140c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/pi-demo/ecmp/BUCK
View File

@ -3,6 +3,7 @@ COMPILE_DEPS = [
'//lib:minimal-json', '//lib:minimal-json',
'//incubator/bmv2/model:onos-incubator-bmv2-model', '//incubator/bmv2/model:onos-incubator-bmv2-model',
'//apps/pi-demo/common:onos-apps-pi-demo-common', '//apps/pi-demo/common:onos-apps-pi-demo-common',
'//drivers/default:onos-drivers-default',
] ]
osgi_jar ( osgi_jar (
@ -12,6 +13,7 @@ osgi_jar (
BUNDLES = [ BUNDLES = [
'//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp', '//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp',
'//apps/pi-demo/common:onos-apps-pi-demo-common', '//apps/pi-demo/common:onos-apps-pi-demo-common',
'//drivers/default:onos-drivers-default',
] ]
onos_app ( onos_app (

7
apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java
View File

@ -21,6 +21,8 @@ import com.google.common.collect.Maps;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;
import org.onlab.util.ImmutableByteSequence; import org.onlab.util.ImmutableByteSequence;
import org.onosproject.driver.pipeline.DefaultSingleTablePipeline;
import org.onosproject.net.behaviour.Pipeliner;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.criteria.Criterion; import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.criteria.PiCriterion; import org.onosproject.net.flow.criteria.PiCriterion;
@ -73,13 +75,14 @@ public class EcmpFabricApp extends AbstractUpgradableFabricApp {
private static final String APP_NAME = "org.onosproject.pi-ecmp-fabric"; private static final String APP_NAME = "org.onosproject.pi-ecmp-fabric";
private static final String MODEL_NAME = "ECMP"; private static final String MODEL_NAME = "ECMP";
private static final String PIPECONF_ID = "org.project.pipeconf.ecmp"; private static final String PIPECONF_ID = "org.project.pipeconf.ecmp";
private static final URL P4INFO_URL = EcmpFabricApp.class.getResource("ecmp.p4info"); private static final URL P4INFO_URL = EcmpFabricApp.class.getResource("/ecmp.p4info");
private static final URL JSON_URL = EcmpFabricApp.class.getResource("ecmp.json"); private static final URL JSON_URL = EcmpFabricApp.class.getResource("/ecmp.json");
private static final PiPipeconf ECMP_PIPECONF = DefaultPiPipeconf.builder() private static final PiPipeconf ECMP_PIPECONF = DefaultPiPipeconf.builder()
.withId(new PiPipeconfId(PIPECONF_ID)) .withId(new PiPipeconfId(PIPECONF_ID))
.withPipelineModel(Bmv2PipelineModelParser.parse(JSON_URL)) .withPipelineModel(Bmv2PipelineModelParser.parse(JSON_URL))
.addBehaviour(PiPipelineInterpreter.class, EcmpInterpreter.class) .addBehaviour(PiPipelineInterpreter.class, EcmpInterpreter.class)
.addBehaviour(Pipeliner.class, DefaultSingleTablePipeline.class)
.addExtension(P4_INFO_TEXT, P4INFO_URL) .addExtension(P4_INFO_TEXT, P4INFO_URL)
.addExtension(BMV2_JSON, JSON_URL) .addExtension(BMV2_JSON, JSON_URL)
.build(); .build();