홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Gerrit Code Review
6f58422e 1 parent da999d67

Removing MISC, BASIC from registration, they are subset of API 

Change-Id: I7e8a816a9a84b36dbd4720e3f6909c2adc99f387
Inline Side-by-side
Showing 4 changed files with 1 additions and 6 deletions
...@@ -103,7 +103,6 @@ public class CordVtnNodeManager { ...@@ -103,7 +103,6 @@ public class CordVtnNodeManager {
103 103
104 private static final KryoNamespace.Builder NODE_SERIALIZER = KryoNamespace.newBuilder() 104 private static final KryoNamespace.Builder NODE_SERIALIZER = KryoNamespace.newBuilder()
105 .register(KryoNamespaces.API) 105 .register(KryoNamespaces.API)
106 - .register(KryoNamespaces.MISC)
107 .register(CordVtnNode.class) 106 .register(CordVtnNode.class)
108 .register(NodeState.class) 107 .register(NodeState.class)
109 .register(SshAccessInfo.class) 108 .register(SshAccessInfo.class)
......
...@@ -106,7 +106,6 @@ public class ControlPlaneMonitor implements ControlPlaneMonitorService { ...@@ -106,7 +106,6 @@ public class ControlPlaneMonitor implements ControlPlaneMonitorService {
106 private static final Serializer SERIALIZER = Serializer 106 private static final Serializer SERIALIZER = Serializer
107 .using(new KryoNamespace.Builder() 107 .using(new KryoNamespace.Builder()
108 .register(KryoNamespaces.API) 108 .register(KryoNamespaces.API)
109 - .register(KryoNamespaces.BASIC)
110 .register(ControlMetricsRequest.class) 109 .register(ControlMetricsRequest.class)
111 .register(ControlResourceRequest.class) 110 .register(ControlResourceRequest.class)
112 .register(ControlLoadSnapshot.class) 111 .register(ControlLoadSnapshot.class)
......
...@@ -145,7 +145,6 @@ public class OpenstackRoutingManager implements OpenstackRoutingService { ...@@ -145,7 +145,6 @@ public class OpenstackRoutingManager implements OpenstackRoutingService {
145 private OpenstackNetworkingConfig config; 145 private OpenstackNetworkingConfig config;
146 private static final KryoNamespace.Builder FLOATING_IP_SERIALIZER = KryoNamespace.newBuilder() 146 private static final KryoNamespace.Builder FLOATING_IP_SERIALIZER = KryoNamespace.newBuilder()
147 .register(KryoNamespaces.API) 147 .register(KryoNamespaces.API)
148 - .register(KryoNamespaces.MISC)
149 .register(OpenstackFloatingIP.FloatingIpStatus.class) 148 .register(OpenstackFloatingIP.FloatingIpStatus.class)
150 .register(OpenstackFloatingIP.class) 149 .register(OpenstackFloatingIP.class)
151 .register(Ip4Address.class) 150 .register(Ip4Address.class)
...@@ -153,13 +152,11 @@ public class OpenstackRoutingManager implements OpenstackRoutingService { ...@@ -153,13 +152,11 @@ public class OpenstackRoutingManager implements OpenstackRoutingService {
153 152
154 private static final KryoNamespace.Builder NUMBER_SERIALIZER = KryoNamespace.newBuilder() 153 private static final KryoNamespace.Builder NUMBER_SERIALIZER = KryoNamespace.newBuilder()
155 .register(KryoNamespaces.API) 154 .register(KryoNamespaces.API)
156 - .register(KryoNamespaces.MISC)
157 .register(Integer.class) 155 .register(Integer.class)
158 .register(String.class); 156 .register(String.class);
159 157
160 private static final KryoNamespace.Builder ROUTER_INTERFACE_SERIALIZER = KryoNamespace.newBuilder() 158 private static final KryoNamespace.Builder ROUTER_INTERFACE_SERIALIZER = KryoNamespace.newBuilder()
161 .register(KryoNamespaces.API) 159 .register(KryoNamespaces.API)
162 - .register(KryoNamespaces.MISC)
163 .register(String.class); 160 .register(String.class);
164 161
165 private InternalPacketProcessor internalPacketProcessor = new InternalPacketProcessor(); 162 private InternalPacketProcessor internalPacketProcessor = new InternalPacketProcessor();
......
...@@ -82,7 +82,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour ...@@ -82,7 +82,7 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
82 private static final String CONTINUOUS_CONSUMER_MAP = "onos-continuous-consumers"; 82 private static final String CONTINUOUS_CONSUMER_MAP = "onos-continuous-consumers";
83 private static final String CHILD_MAP = "onos-resource-children"; 83 private static final String CHILD_MAP = "onos-resource-children";
84 private static final Serializer SERIALIZER = Serializer.using( 84 private static final Serializer SERIALIZER = Serializer.using(
85 - Arrays.asList(KryoNamespaces.BASIC, KryoNamespaces.API), 85 + Arrays.asList(KryoNamespaces.API),
86 ContinuousResourceAllocation.class); 86 ContinuousResourceAllocation.class);
87 87
88 // TODO: We should provide centralized values for this 88 // TODO: We should provide centralized values for this
......