홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
bf366d51 1 parent 88375780

LinkResourceStores: use AnnotationKeys 

Change-Id: I6d24d458a9d9c538ac55257f200e3cff79b1ef6d
Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
...@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.Deactivate;
29 import org.apache.felix.scr.annotations.Reference; 29 import org.apache.felix.scr.annotations.Reference;
30 import org.apache.felix.scr.annotations.ReferenceCardinality; 30 import org.apache.felix.scr.annotations.ReferenceCardinality;
31 import org.apache.felix.scr.annotations.Service; 31 import org.apache.felix.scr.annotations.Service;
32 +import org.onlab.onos.net.AnnotationKeys;
32 import org.onlab.onos.net.Link; 33 import org.onlab.onos.net.Link;
33 import org.onlab.onos.net.LinkKey; 34 import org.onlab.onos.net.LinkKey;
34 import org.onlab.onos.net.intent.IntentId; 35 import org.onlab.onos.net.intent.IntentId;
...@@ -99,9 +100,9 @@ public class DistributedLinkResourceStore implements LinkResourceStore { ...@@ -99,9 +100,9 @@ public class DistributedLinkResourceStore implements LinkResourceStore {
99 protected LinkService linkService; 100 protected LinkService linkService;
100 101
101 // Link annotation key name to use as bandwidth 102 // Link annotation key name to use as bandwidth
102 - private String bandwidthAnnotation = "bandwidth"; 103 + private String bandwidthAnnotation = AnnotationKeys.BANDWIDTH;
103 // Link annotation key name to use as max lambda 104 // Link annotation key name to use as max lambda
104 - private String wavesAnnotation = "optical.waves"; 105 + private String wavesAnnotation = AnnotationKeys.OPTICAL_WAVES;
105 106
106 private StoreSerializer serializer; 107 private StoreSerializer serializer;
107 108
......
...@@ -30,6 +30,7 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -30,6 +30,7 @@ import org.apache.felix.scr.annotations.Deactivate;
30 import org.apache.felix.scr.annotations.Reference; 30 import org.apache.felix.scr.annotations.Reference;
31 import org.apache.felix.scr.annotations.ReferenceCardinality; 31 import org.apache.felix.scr.annotations.ReferenceCardinality;
32 import org.apache.felix.scr.annotations.Service; 32 import org.apache.felix.scr.annotations.Service;
33 +import org.onlab.onos.net.AnnotationKeys;
33 import org.onlab.onos.net.Link; 34 import org.onlab.onos.net.Link;
34 import org.onlab.onos.net.LinkKey; 35 import org.onlab.onos.net.LinkKey;
35 import org.onlab.onos.net.intent.IntentId; 36 import org.onlab.onos.net.intent.IntentId;
...@@ -95,9 +96,9 @@ public class HazelcastLinkResourceStore ...@@ -95,9 +96,9 @@ public class HazelcastLinkResourceStore
95 protected LinkService linkService; 96 protected LinkService linkService;
96 97
97 // Link annotation key name to use as bandwidth 98 // Link annotation key name to use as bandwidth
98 - private String bandwidthAnnotation = "bandwidth"; 99 + private String bandwidthAnnotation = AnnotationKeys.BANDWIDTH;
99 // Link annotation key name to use as max lambda 100 // Link annotation key name to use as max lambda
100 - private String wavesAnnotation = "optical.waves"; 101 + private String wavesAnnotation = AnnotationKeys.OPTICAL_WAVES;
101 102
102 @Override 103 @Override
103 @Activate 104 @Activate
......