홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
ea961ffc 1 parent a5368868

Moved trivial from net to store. 

Fixed some javadocs.
Inline Side-by-side
Showing 29 changed files with 39 additions and 27 deletions
...@@ -15,7 +15,7 @@ import org.onlab.onos.cluster.MastershipTermService; ...@@ -15,7 +15,7 @@ import org.onlab.onos.cluster.MastershipTermService;
15 import org.onlab.onos.cluster.NodeId; 15 import org.onlab.onos.cluster.NodeId;
16 import org.onlab.onos.event.impl.TestEventDispatcher; 16 import org.onlab.onos.event.impl.TestEventDispatcher;
17 import org.onlab.onos.net.DeviceId; 17 import org.onlab.onos.net.DeviceId;
18 -import org.onlab.onos.net.trivial.impl.SimpleMastershipStore; 18 +import org.onlab.onos.store.trivial.impl.SimpleMastershipStore;
19 import org.onlab.packet.IpPrefix; 19 import org.onlab.packet.IpPrefix;
20 20
21 import static org.junit.Assert.assertEquals; 21 import static org.junit.Assert.assertEquals;
......
...@@ -27,7 +27,7 @@ import org.onlab.onos.net.device.DeviceService; ...@@ -27,7 +27,7 @@ import org.onlab.onos.net.device.DeviceService;
27 import org.onlab.onos.net.device.PortDescription; 27 import org.onlab.onos.net.device.PortDescription;
28 import org.onlab.onos.net.provider.AbstractProvider; 28 import org.onlab.onos.net.provider.AbstractProvider;
29 import org.onlab.onos.net.provider.ProviderId; 29 import org.onlab.onos.net.provider.ProviderId;
30 -import org.onlab.onos.net.trivial.impl.SimpleDeviceStore; 30 +import org.onlab.onos.store.trivial.impl.SimpleDeviceStore;
31 31
32 import java.util.ArrayList; 32 import java.util.ArrayList;
33 import java.util.Iterator; 33 import java.util.Iterator;
......
...@@ -40,7 +40,7 @@ import org.onlab.onos.net.flow.criteria.Criterion; ...@@ -40,7 +40,7 @@ import org.onlab.onos.net.flow.criteria.Criterion;
40 import org.onlab.onos.net.flow.instructions.Instruction; 40 import org.onlab.onos.net.flow.instructions.Instruction;
41 import org.onlab.onos.net.provider.AbstractProvider; 41 import org.onlab.onos.net.provider.AbstractProvider;
42 import org.onlab.onos.net.provider.ProviderId; 42 import org.onlab.onos.net.provider.ProviderId;
43 -import org.onlab.onos.net.trivial.impl.SimpleFlowRuleStore; 43 +import org.onlab.onos.store.trivial.impl.SimpleFlowRuleStore;
44 44
45 import com.google.common.collect.Lists; 45 import com.google.common.collect.Lists;
46 import com.google.common.collect.Sets; 46 import com.google.common.collect.Sets;
......
...@@ -34,7 +34,7 @@ import org.onlab.onos.net.host.HostProviderService; ...@@ -34,7 +34,7 @@ import org.onlab.onos.net.host.HostProviderService;
34 import org.onlab.onos.net.host.PortAddresses; 34 import org.onlab.onos.net.host.PortAddresses;
35 import org.onlab.onos.net.provider.AbstractProvider; 35 import org.onlab.onos.net.provider.AbstractProvider;
36 import org.onlab.onos.net.provider.ProviderId; 36 import org.onlab.onos.net.provider.ProviderId;
37 -import org.onlab.onos.net.trivial.impl.SimpleHostStore; 37 +import org.onlab.onos.store.trivial.impl.SimpleHostStore;
38 import org.onlab.packet.IpPrefix; 38 import org.onlab.packet.IpPrefix;
39 import org.onlab.packet.MacAddress; 39 import org.onlab.packet.MacAddress;
40 import org.onlab.packet.VlanId; 40 import org.onlab.packet.VlanId;
......
...@@ -23,7 +23,7 @@ import org.onlab.onos.net.provider.AbstractProvider; ...@@ -23,7 +23,7 @@ import org.onlab.onos.net.provider.AbstractProvider;
23 import org.onlab.onos.net.provider.ProviderId; 23 import org.onlab.onos.net.provider.ProviderId;
24 import org.onlab.onos.event.impl.TestEventDispatcher; 24 import org.onlab.onos.event.impl.TestEventDispatcher;
25 import org.onlab.onos.net.device.impl.DeviceManager; 25 import org.onlab.onos.net.device.impl.DeviceManager;
26 -import org.onlab.onos.net.trivial.impl.SimpleLinkStore; 26 +import org.onlab.onos.store.trivial.impl.SimpleLinkStore;
27 27
28 import java.util.ArrayList; 28 import java.util.ArrayList;
29 import java.util.Iterator; 29 import java.util.Iterator;
......
...@@ -24,7 +24,7 @@ import org.onlab.onos.net.topology.TopologyProvider; ...@@ -24,7 +24,7 @@ import org.onlab.onos.net.topology.TopologyProvider;
24 import org.onlab.onos.net.topology.TopologyProviderRegistry; 24 import org.onlab.onos.net.topology.TopologyProviderRegistry;
25 import org.onlab.onos.net.topology.TopologyProviderService; 25 import org.onlab.onos.net.topology.TopologyProviderService;
26 import org.onlab.onos.net.topology.TopologyService; 26 import org.onlab.onos.net.topology.TopologyService;
27 -import org.onlab.onos.net.trivial.impl.SimpleTopologyStore; 27 +import org.onlab.onos.store.trivial.impl.SimpleTopologyStore;
28 28
29 import java.util.ArrayList; 29 import java.util.ArrayList;
30 import java.util.List; 30 import java.util.List;
......
...@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableSet; ...@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableSet;
28 import com.google.common.collect.Multimap; 28 import com.google.common.collect.Multimap;
29 29
30 /** 30 /**
31 - * Manages inventory of flow rules using trivial in-memory implementation. 31 + * TEMPORARY: Manages inventory of flow rules using distributed store implementation.
32 */ 32 */
33 //FIXME: I LIE I AM NOT DISTRIBUTED 33 //FIXME: I LIE I AM NOT DISTRIBUTED
34 @Component(immediate = true) 34 @Component(immediate = true)
......
1 +/**
2 + * Implementation of flow store using Hazelcast distributed structures.
3 + */
4 +package org.onlab.onos.store.flow.impl;
...@@ -39,8 +39,8 @@ import com.google.common.collect.Multimap; ...@@ -39,8 +39,8 @@ import com.google.common.collect.Multimap;
39 import com.google.common.collect.Sets; 39 import com.google.common.collect.Sets;
40 40
41 /** 41 /**
42 - * Manages inventory of end-station hosts using trivial in-memory 42 + * TEMPORARY: Manages inventory of end-station hosts using distributed
43 - * implementation. 43 + * structures implementation.
44 */ 44 */
45 //FIXME: I LIE I AM NOT DISTRIBUTED 45 //FIXME: I LIE I AM NOT DISTRIBUTED
46 @Component(immediate = true) 46 @Component(immediate = true)
......
1 +/**
2 + * Implementation of host store using Hazelcast distributed structures.
3 + */
4 +package org.onlab.onos.store.host.impl;
...@@ -28,7 +28,7 @@ import org.onlab.onos.store.AbstractStore; ...@@ -28,7 +28,7 @@ import org.onlab.onos.store.AbstractStore;
28 import org.slf4j.Logger; 28 import org.slf4j.Logger;
29 29
30 /** 30 /**
31 - * Manages inventory of topology snapshots using trivial in-memory 31 + * TEMPORARY: Manages inventory of topology snapshots using distributed
32 * structures implementation. 32 * structures implementation.
33 */ 33 */
34 //FIXME: I LIE I AM NOT DISTRIBUTED 34 //FIXME: I LIE I AM NOT DISTRIBUTED
......
1 +/**
2 + * Implementation of topology store using Hazelcast distributed structures.
3 + */
4 +package org.onlab.onos.store.topology.impl;
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import com.google.common.collect.ImmutableMap; 3 import com.google.common.collect.ImmutableMap;
4 import com.google.common.collect.ImmutableSet; 4 import com.google.common.collect.ImmutableSet;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import org.onlab.graph.AdjacencyListsGraph; 3 import org.onlab.graph.AdjacencyListsGraph;
4 import org.onlab.onos.net.topology.TopologyEdge; 4 import org.onlab.onos.net.topology.TopologyEdge;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import org.apache.felix.scr.annotations.Component; 3 import org.apache.felix.scr.annotations.Component;
4 import org.apache.felix.scr.annotations.Service; 4 import org.apache.felix.scr.annotations.Service;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import org.onlab.onos.net.DeviceId; 3 import org.onlab.onos.net.DeviceId;
4 4
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import com.google.common.collect.ImmutableSet; 3 import com.google.common.collect.ImmutableSet;
4 import org.apache.felix.scr.annotations.Activate; 4 import org.apache.felix.scr.annotations.Activate;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import com.google.common.collect.FluentIterable; 3 import com.google.common.collect.FluentIterable;
4 import com.google.common.collect.ImmutableList; 4 import com.google.common.collect.ImmutableList;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_ADDED; 3 import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_ADDED;
4 import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_REMOVED; 4 import static org.onlab.onos.net.flow.FlowRuleEvent.Type.RULE_REMOVED;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED; 3 import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
4 import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED; 4 import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import com.google.common.collect.HashMultimap; 3 import com.google.common.collect.HashMultimap;
4 import com.google.common.collect.ImmutableSet; 4 import com.google.common.collect.ImmutableSet;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import static org.slf4j.LoggerFactory.getLogger; 3 import static org.slf4j.LoggerFactory.getLogger;
4 4
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import org.apache.felix.scr.annotations.Activate; 3 import org.apache.felix.scr.annotations.Activate;
4 import org.apache.felix.scr.annotations.Component; 4 import org.apache.felix.scr.annotations.Component;
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
2 * Implementations of in-memory stores suitable for unit testing and 2 * Implementations of in-memory stores suitable for unit testing and
3 * experimentation; not for production use. 3 * experimentation; not for production use.
4 */ 4 */
5 -package org.onlab.onos.net.trivial.impl; 5 +package org.onlab.onos.store.trivial.impl;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import org.junit.Before; 3 import org.junit.Before;
4 import org.junit.Test; 4 import org.junit.Test;
......
1 /** 1 /**
2 * 2 *
3 */ 3 */
4 -package org.onlab.onos.net.trivial.impl; 4 +package org.onlab.onos.store.trivial.impl;
5 5
6 import static org.junit.Assert.*; 6 import static org.junit.Assert.*;
7 import static org.onlab.onos.net.Device.Type.SWITCH; 7 import static org.onlab.onos.net.Device.Type.SWITCH;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import static org.junit.Assert.*; 3 import static org.junit.Assert.*;
4 import static org.onlab.onos.net.DeviceId.deviceId; 4 import static org.onlab.onos.net.DeviceId.deviceId;
......
1 -package org.onlab.onos.net.trivial.impl; 1 +package org.onlab.onos.store.trivial.impl;
2 2
3 import java.util.Set; 3 import java.util.Set;
4 import java.util.concurrent.atomic.AtomicInteger; 4 import java.util.concurrent.atomic.AtomicInteger;
......
...@@ -419,7 +419,7 @@ ...@@ -419,7 +419,7 @@
419 <group> 419 <group>
420 <title>Core Subsystems</title> 420 <title>Core Subsystems</title>
421 <packages> 421 <packages>
422 - org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.net.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.* 422 + org.onlab.onos.cluster.impl:org.onlab.onos.net.device.impl:org.onlab.onos.net.link.impl:org.onlab.onos.net.host.impl:org.onlab.onos.net.topology.impl:org.onlab.onos.net.packet.impl:org.onlab.onos.net.flow.impl:org.onlab.onos.store.trivial.*:org.onlab.onos.net.*.impl:org.onlab.onos.event.impl:org.onlab.onos.store.*
423 </packages> 423 </packages>
424 </group> 424 </group>
425 <group> 425 <group>
......