홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
c057c639 1 parent cad78e9a

Moving classes around, reflecting discussion with Madan. 

Change-Id: I83a08fc3f31003b6a521f3f7fe48c47b5c489bb1
Inline Side-by-side
Showing 10 changed files with 13 additions and 10 deletions
1 -package org.onlab.onos.store.cluster.messaging.impl; 1 +package org.onlab.onos.store.cluster.impl;
2 2
3 import org.onlab.onos.store.cluster.messaging.MessageSubject; 3 import org.onlab.onos.store.cluster.messaging.MessageSubject;
4 4
5 -public final class ClusterMessageSubjects { 5 +public final class ClusterManagementMessageSubjects {
6 // avoid instantiation 6 // avoid instantiation
7 - private ClusterMessageSubjects() {} 7 + private ClusterManagementMessageSubjects() {}
8 8
9 public static final MessageSubject CLUSTER_MEMBERSHIP_EVENT = new MessageSubject("CLUSTER_MEMBERSHIP_EVENT"); 9 public static final MessageSubject CLUSTER_MEMBERSHIP_EVENT = new MessageSubject("CLUSTER_MEMBERSHIP_EVENT");
10 } 10 }
......
1 -package org.onlab.onos.store.cluster.messaging.impl; 1 +package org.onlab.onos.store.cluster.impl;
2 2
3 import org.onlab.onos.cluster.ControllerNode; 3 import org.onlab.onos.cluster.ControllerNode;
4 4
......
1 -package org.onlab.onos.store.cluster.messaging.impl; 1 +package org.onlab.onos.store.cluster.impl;
2 2
3 public enum ClusterMembershipEventType { 3 public enum ClusterMembershipEventType {
4 NEW_MEMBER, 4 NEW_MEMBER,
......
...@@ -17,6 +17,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -17,6 +17,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
17 import org.apache.felix.scr.annotations.Service; 17 import org.apache.felix.scr.annotations.Service;
18 import org.onlab.onos.cluster.ControllerNode; 18 import org.onlab.onos.cluster.ControllerNode;
19 import org.onlab.onos.cluster.NodeId; 19 import org.onlab.onos.cluster.NodeId;
20 +import org.onlab.onos.store.cluster.impl.ClusterMembershipEvent;
21 +import org.onlab.onos.store.cluster.impl.ClusterMembershipEventType;
20 import org.onlab.onos.store.cluster.impl.ClusterNodesDelegate; 22 import org.onlab.onos.store.cluster.impl.ClusterNodesDelegate;
21 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationAdminService; 23 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationAdminService;
22 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; 24 import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
......
1 -package org.onlab.onos.store.cluster.impl; 1 +package org.onlab.onos.store.cluster.messaging.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;
......
1 -package org.onlab.onos.store.cluster.messaging; 1 +package org.onlab.onos.store.common.impl;
2 2
3 import java.util.Map; 3 import java.util.Map;
4 4
......
1 -package org.onlab.onos.store.cluster.messaging; 1 +package org.onlab.onos.store.common.impl;
2 2
3 import java.util.Map; 3 import java.util.Map;
4 import java.util.Set; 4 import java.util.Set;
......
...@@ -8,7 +8,7 @@ import org.onlab.onos.cluster.NodeId; ...@@ -8,7 +8,7 @@ import org.onlab.onos.cluster.NodeId;
8 import org.onlab.onos.net.Device; 8 import org.onlab.onos.net.Device;
9 import org.onlab.onos.net.DeviceId; 9 import org.onlab.onos.net.DeviceId;
10 import org.onlab.onos.store.Timestamp; 10 import org.onlab.onos.store.Timestamp;
11 -import org.onlab.onos.store.cluster.messaging.AntiEntropyAdvertisement; 11 +import org.onlab.onos.store.common.impl.AntiEntropyAdvertisement;
12 12
13 // TODO DeviceID needs to be changed to something like (ProviderID, DeviceID) 13 // TODO DeviceID needs to be changed to something like (ProviderID, DeviceID)
14 // TODO: Handle Port as part of these messages, or separate messages for Ports? 14 // TODO: Handle Port as part of these messages, or separate messages for Ports?
......
...@@ -10,7 +10,7 @@ import org.onlab.onos.cluster.NodeId; ...@@ -10,7 +10,7 @@ import org.onlab.onos.cluster.NodeId;
10 import org.onlab.onos.net.Device; 10 import org.onlab.onos.net.Device;
11 import org.onlab.onos.net.DeviceId; 11 import org.onlab.onos.net.DeviceId;
12 import org.onlab.onos.store.Timestamp; 12 import org.onlab.onos.store.Timestamp;
13 -import org.onlab.onos.store.cluster.messaging.AntiEntropyReply; 13 +import org.onlab.onos.store.common.impl.AntiEntropyReply;
14 14
15 import com.google.common.collect.ImmutableMap; 15 import com.google.common.collect.ImmutableMap;
16 import com.google.common.collect.ImmutableSet; 16 import com.google.common.collect.ImmutableSet;
......
...@@ -7,6 +7,7 @@ import org.junit.Test; ...@@ -7,6 +7,7 @@ import org.junit.Test;
7 import org.onlab.onos.cluster.DefaultControllerNode; 7 import org.onlab.onos.cluster.DefaultControllerNode;
8 import org.onlab.onos.cluster.NodeId; 8 import org.onlab.onos.cluster.NodeId;
9 import org.onlab.onos.store.cluster.messaging.impl.ClusterCommunicationManager; 9 import org.onlab.onos.store.cluster.messaging.impl.ClusterCommunicationManager;
10 +import org.onlab.onos.store.cluster.messaging.impl.MessageSerializer;
10 import org.onlab.netty.NettyMessagingService; 11 import org.onlab.netty.NettyMessagingService;
11 import org.onlab.packet.IpPrefix; 12 import org.onlab.packet.IpPrefix;
12 13
......