홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
5f1fa014 1 parent 506f287f

Refactor: Remove unused fields 

Change-Id: I224bdc1f2148d68b317028aafaed07dca39ba50f
Inline Side-by-side
Showing 2 changed files with 0 additions and 17 deletions
...@@ -42,7 +42,6 @@ import org.onosproject.net.intent.impl.IntentCompilationException; ...@@ -42,7 +42,6 @@ import org.onosproject.net.intent.impl.IntentCompilationException;
42 import org.onosproject.net.newresource.ResourcePath; 42 import org.onosproject.net.newresource.ResourcePath;
43 import org.onosproject.net.newresource.ResourceService; 43 import org.onosproject.net.newresource.ResourceService;
44 import org.onosproject.net.resource.ResourceType; 44 import org.onosproject.net.resource.ResourceType;
45 -import org.onosproject.net.resource.device.DeviceResourceService;
46 import org.onosproject.net.resource.link.DefaultLinkResourceRequest; 45 import org.onosproject.net.resource.link.DefaultLinkResourceRequest;
47 import org.onosproject.net.resource.link.LambdaResource; 46 import org.onosproject.net.resource.link.LambdaResource;
48 import org.onosproject.net.resource.link.LambdaResourceAllocation; 47 import org.onosproject.net.resource.link.LambdaResourceAllocation;
...@@ -84,9 +83,6 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical ...@@ -84,9 +83,6 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical
84 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 83 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
85 protected LinkResourceService linkResourceService; 84 protected LinkResourceService linkResourceService;
86 85
87 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
88 - protected DeviceResourceService deviceResourceService;
89 -
90 @Activate 86 @Activate
91 public void activate() { 87 public void activate() {
92 intentManager.registerCompiler(OpticalConnectivityIntent.class, this); 88 intentManager.registerCompiler(OpticalConnectivityIntent.class, this);
......
...@@ -21,7 +21,6 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -21,7 +21,6 @@ import org.apache.felix.scr.annotations.Deactivate;
21 import org.apache.felix.scr.annotations.Reference; 21 import org.apache.felix.scr.annotations.Reference;
22 import org.apache.felix.scr.annotations.ReferenceCardinality; 22 import org.apache.felix.scr.annotations.ReferenceCardinality;
23 import org.apache.felix.scr.annotations.Service; 23 import org.apache.felix.scr.annotations.Service;
24 -import org.onosproject.net.Port;
25 import org.onosproject.net.device.DeviceService; 24 import org.onosproject.net.device.DeviceService;
26 import org.onosproject.net.intent.IntentId; 25 import org.onosproject.net.intent.IntentId;
27 import org.onosproject.net.resource.device.DeviceResourceStore; 26 import org.onosproject.net.resource.device.DeviceResourceStore;
...@@ -45,14 +44,10 @@ import static org.slf4j.LoggerFactory.getLogger; ...@@ -45,14 +44,10 @@ import static org.slf4j.LoggerFactory.getLogger;
45 public class ConsistentDeviceResourceStore implements DeviceResourceStore { 44 public class ConsistentDeviceResourceStore implements DeviceResourceStore {
46 private final Logger log = getLogger(getClass()); 45 private final Logger log = getLogger(getClass());
47 46
48 - private static final String PORT_ALLOCATIONS = "PortAllocations";
49 private static final String INTENT_MAPPING = "IntentMapping"; 47 private static final String INTENT_MAPPING = "IntentMapping";
50 - private static final String INTENT_ALLOCATIONS = "PortIntentAllocations";
51 48
52 private static final Serializer SERIALIZER = Serializer.using(KryoNamespaces.API); 49 private static final Serializer SERIALIZER = Serializer.using(KryoNamespaces.API);
53 50
54 - private ConsistentMap<Port, IntentId> portAllocMap;
55 - private ConsistentMap<IntentId, Set<Port>> intentAllocMap;
56 private ConsistentMap<IntentId, Set<IntentId>> intentMapping; 51 private ConsistentMap<IntentId, Set<IntentId>> intentMapping;
57 52
58 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 53 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
...@@ -63,14 +58,6 @@ public class ConsistentDeviceResourceStore implements DeviceResourceStore { ...@@ -63,14 +58,6 @@ public class ConsistentDeviceResourceStore implements DeviceResourceStore {
63 58
64 @Activate 59 @Activate
65 public void activate() { 60 public void activate() {
66 - portAllocMap = storageService.<Port, IntentId>consistentMapBuilder()
67 - .withName(PORT_ALLOCATIONS)
68 - .withSerializer(SERIALIZER)
69 - .build();
70 - intentAllocMap = storageService.<IntentId, Set<Port>>consistentMapBuilder()
71 - .withName(INTENT_ALLOCATIONS)
72 - .withSerializer(SERIALIZER)
73 - .build();
74 intentMapping = storageService.<IntentId, Set<IntentId>>consistentMapBuilder() 61 intentMapping = storageService.<IntentId, Set<IntentId>>consistentMapBuilder()
75 .withName(INTENT_MAPPING) 62 .withName(INTENT_MAPPING)
76 .withSerializer(SERIALIZER) 63 .withSerializer(SERIALIZER)
......