Refactored IntentPartitionService as WorkPartitionService
Change-Id: Ic5cf1978b7fce55b34f84eae9b03c8f9ddcfb9c1
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionService.java
deleted file mode 100644
index 4933600..0000000
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.intent;
-
-import com.google.common.annotations.Beta;
-import org.onosproject.cluster.NodeId;
-import org.onosproject.event.ListenerService;
-
-/**
- * Service for interacting with the intent partition-to-instance assignments.
- */
-@Beta
-public interface IntentPartitionService
- extends ListenerService<IntentPartitionEvent, IntentPartitionEventListener> {
-
- /**
- * Returns whether the given intent key is in a partition owned by this
- * instance or not.
- *
- * @param intentKey intent key to query
- * @return true if the key is owned by this instance, otherwise false
- */
- boolean isMine(Key intentKey);
-
- /**
- * Returns the leader for a particular key.
- *
- * @param intentKey intent key to query
- * @return the leader node
- */
- NodeId getLeader(Key intentKey);
-
- // TODO add API for rebalancing partitions
-
-}
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEvent.java b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEvent.java
similarity index 85%
rename from core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEvent.java
rename to core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEvent.java
index 018724e..7e6571c 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEvent.java
@@ -23,13 +23,13 @@
*/
//TODO change String into a proper object type
@Beta
-public class IntentPartitionEvent extends AbstractEvent<IntentPartitionEvent.Type, String> {
+public class WorkPartitionEvent extends AbstractEvent<WorkPartitionEvent.Type, String> {
public enum Type {
LEADER_CHANGED
}
- public IntentPartitionEvent(Type type, String partition) {
+ public WorkPartitionEvent(Type type, String partition) {
super(type, partition);
}
}
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEventListener.java b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEventListener.java
similarity index 89%
rename from core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEventListener.java
rename to core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEventListener.java
index 2a8701d..7dae192 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentPartitionEventListener.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionEventListener.java
@@ -22,5 +22,5 @@
* Entity capable of receiving device partition-related events.
*/
@Beta
-public interface IntentPartitionEventListener extends EventListener<IntentPartitionEvent> {
+public interface WorkPartitionEventListener extends EventListener<WorkPartitionEvent> {
}
diff --git a/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionService.java b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionService.java
new file mode 100644
index 0000000..354bca4
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/intent/WorkPartitionService.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import java.util.function.Function;
+
+import org.onosproject.cluster.NodeId;
+import org.onosproject.event.ListenerService;
+
+import com.google.common.annotations.Beta;
+
+/**
+ * Service for partitioning work, represented via a unique identifier, onto cluster nodes.
+ */
+@Beta
+public interface WorkPartitionService
+ extends ListenerService<WorkPartitionEvent, WorkPartitionEventListener> {
+
+ /**
+ * Returns whether a given id maps to a partition owned by this
+ * instance.
+ *
+ * @param id id
+ * @param hasher function that maps id to a long value
+ * @return {@code true} if the id maps to a partition owned by this instance, otherwise {@code false}
+ */
+ <K> boolean isMine(K id, Function<K, Long> hasher);
+
+ /**
+ * Returns the owner for a given id.
+ *
+ * @param id id to query
+ * @param hasher function that maps id to a long value
+ * @return the leader node identifier
+ */
+ <K> NodeId getLeader(K id, Function<K, Long> hasher);
+}