홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
a1376e46 1 parent c78acee3

Enahnced topology and flow stores to extend general store.

Inline Side-by-side
Showing 2 changed files with 7 additions and 9 deletions
1 package org.onlab.onos.net.flow.impl; 1 package org.onlab.onos.net.flow.impl;
2 2
3 -import static com.google.common.base.Preconditions.checkNotNull; 3 +import com.google.common.collect.Lists;
4 -import static org.slf4j.LoggerFactory.getLogger;
5 -
6 -import java.util.Iterator;
7 -import java.util.List;
8 -
9 import org.apache.felix.scr.annotations.Activate; 4 import org.apache.felix.scr.annotations.Activate;
10 import org.apache.felix.scr.annotations.Component; 5 import org.apache.felix.scr.annotations.Component;
11 import org.apache.felix.scr.annotations.Deactivate; 6 import org.apache.felix.scr.annotations.Deactivate;
...@@ -28,12 +23,15 @@ import org.onlab.onos.net.flow.FlowRuleProviderService; ...@@ -28,12 +23,15 @@ import org.onlab.onos.net.flow.FlowRuleProviderService;
28 import org.onlab.onos.net.flow.FlowRuleService; 23 import org.onlab.onos.net.flow.FlowRuleService;
29 import org.onlab.onos.net.flow.FlowRuleStore; 24 import org.onlab.onos.net.flow.FlowRuleStore;
30 import org.onlab.onos.net.flow.FlowRuleStoreDelegate; 25 import org.onlab.onos.net.flow.FlowRuleStoreDelegate;
31 -import org.onlab.onos.net.host.HostStoreDelegate;
32 import org.onlab.onos.net.provider.AbstractProviderRegistry; 26 import org.onlab.onos.net.provider.AbstractProviderRegistry;
33 import org.onlab.onos.net.provider.AbstractProviderService; 27 import org.onlab.onos.net.provider.AbstractProviderService;
34 import org.slf4j.Logger; 28 import org.slf4j.Logger;
35 29
36 -import com.google.common.collect.Lists; 30 +import java.util.Iterator;
31 +import java.util.List;
32 +
33 +import static com.google.common.base.Preconditions.checkNotNull;
34 +import static org.slf4j.LoggerFactory.getLogger;
37 35
38 /** 36 /**
39 * Provides implementation of the flow NB & SB APIs. 37 * Provides implementation of the flow NB & SB APIs.
......
...@@ -51,7 +51,7 @@ perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onlab.onos/onos-feature ...@@ -51,7 +51,7 @@ perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onlab.onos/onos-feature
51 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 51 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
52 52
53 # Patch the Apache Karaf distribution file to load ONOS features 53 # Patch the Apache Karaf distribution file to load ONOS features
54 -perl -pi.old -e 's|^(featuresBoot=.*)|\1,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo|' \ 54 +perl -pi.old -e 's|^(featuresBoot=.*)|\1,webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo|' \
55 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 55 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
56 56
57 # Patch the Apache Karaf distribution with ONOS branding bundle 57 # Patch the Apache Karaf distribution with ONOS branding bundle
......