commit bcb0237f3bfd840677dc0d0df7d8918a8f2eef19
author Ayaka Koshibe <ayaka@onlab.us> Mon Jun 01 10:56:42 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 01 18:26:17 2015 +0000
tree 8e5118ea08bba85444ce6a19ba31ca4968069222
parent 17ff25fe9175eadb699e89e36b5f1ed6b08d581d

Bug fixes for Optical Intent installation and removal

 - Missing serializer for OchSignalTypes
 - Aliasing of transactional maps in *ResourceStores
 - NPE during Intent removal

Conflicts:
	apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java

Change-Id: If882c48553a4a594341ddb743e0c3f420656d954

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
index 09c2269..b519652 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
@@ -52,8 +52,8 @@
     private final Logger log = getLogger(getClass());
 
     private static final String PORT_ALLOCATIONS = "PortAllocations";
-    private static final String INTENT_ALLOCATIONS = "IntentAllocations";
     private static final String INTENT_MAPPING = "IntentMapping";
+    private static final String INTENT_ALLOCATIONS = "PortIntentAllocations";
 
     private static final Serializer SERIALIZER = Serializer.using(
             new KryoNamespace.Builder().register(KryoNamespaces.API).build());

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
index 84f7bb2..74ec8f7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
@@ -79,10 +79,10 @@
 
     // table to store current allocations
     /** LinkKey -> List<LinkResourceAllocations>. */
-    private static final String LINK_RESOURCE_ALLOCATIONS = "o";
+    private static final String LINK_RESOURCE_ALLOCATIONS = "LinkAllocations";
 
     /** IntentId -> LinkResourceAllocations. */
-    private static final String INTENT_ALLOCATIONS = "IntentAllocations";
+    private static final String INTENT_ALLOCATIONS = "LinkIntentAllocations";
 
     private static final Serializer SERIALIZER = Serializer.using(
             new KryoNamespace.Builder().register(KryoNamespaces.API).build());