| commit | dbe4c53b85580f4c5c5827029898ac768a394ee6 | [log] [tgz] |
|---|---|---|
| author | Jon Hall <jhall@ciena.com> | Tue Oct 04 11:45:52 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Mon Oct 17 13:07:16 2016 +0000 |
| tree | 6c23cc24bd657df12d76c10cc0c2f92c745eb176 | |
| parent | 7b2a60be584741c2f461b4c6a37efad337f3394f [diff] |
Update map names to match naming convention Change-Id: Ieea30b4531da468824e22af1679acfc556887a2a
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java b/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java index 47596e3..e0267f4 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/flowobjective/impl/DistributedFlowObjectiveStore.java
@@ -75,7 +75,7 @@ eventQ = new LinkedBlockingQueue<ObjectiveEvent>(); tpool.execute(new FlowObjectiveNotifier()); nextGroups = storageService.<Integer, byte[]>consistentMapBuilder() - .withName("flowobjective-groups") + .withName("onos-flowobjective-groups") .withSerializer(Serializer.using( new KryoNamespace.Builder() .register(byte[].class)
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/ConsistentIntentSetMultimap.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/ConsistentIntentSetMultimap.java index 851dfd9..0bf5611 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/ConsistentIntentSetMultimap.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/ConsistentIntentSetMultimap.java
@@ -47,7 +47,7 @@ public class ConsistentIntentSetMultimap implements IntentSetMultimap { private final Logger log = getLogger(getClass()); - private static final String INTENT_MAPPING = "IntentMapping"; + private static final String INTENT_MAPPING = "onos-intent-mapping"; private static final Serializer SERIALIZER = Serializer.using(KryoNamespaces.API);
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java index a1d00b2..3af1e2a 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java +++ b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
@@ -54,7 +54,7 @@ // map and not emitting events but rather use a provider-like mechanism // to program the dataplane. - private static final String MCASTRIB = "mcast-rib-table"; + private static final String MCASTRIB = "onos-mcast-rib-table"; private Logger log = getLogger(getClass()); @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/resource/impl/DistributedLabelResourceStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/resource/impl/DistributedLabelResourceStore.java index 3da65ee..ef3e228 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/resource/impl/DistributedLabelResourceStore.java +++ b/incubator/store/src/main/java/org/onosproject/incubator/store/resource/impl/DistributedLabelResourceStore.java
@@ -75,7 +75,7 @@ implements LabelResourceStore { private final Logger log = getLogger(getClass()); - private static final String POOL_MAP_NAME = "labelresourcepool"; + private static final String POOL_MAP_NAME = "onos-label-resource-pool"; private static final String GLOBAL_RESOURCE_POOL_DEVICE_ID = "global_resource_pool_device_id";