ONOS-239 Retrigger compilation when new resources are available
When an intent is withdrawn and frees up resources, trigger
recompilation of any failed intents to allow the ones waiting
for resources to be installed.
Change-Id: Ic15678378ce41516a7eab890b4b4898aeb901f78
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceEvent.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceEvent.java
new file mode 100644
index 0000000..0428864
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceEvent.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 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.onlab.onos.net.resource;
+
+import java.util.Collection;
+
+import org.onlab.onos.event.AbstractEvent;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Describes an event related to a Link Resource.
+ */
+public final class LinkResourceEvent
+ extends AbstractEvent<LinkResourceEvent.Type, Collection<LinkResourceAllocations>> {
+
+ /**
+ * Type of resource this event is for.
+ */
+ public enum Type {
+ /** Additional resources are now available. */
+ ADDITIONAL_RESOURCES_AVAILABLE
+ }
+
+ /**
+ * Constructs a link resource event.
+ *
+ * @param type type of resource event to create
+ * @param linkResourceAllocations allocations that are now available
+ */
+ public LinkResourceEvent(Type type,
+ Collection<LinkResourceAllocations> linkResourceAllocations) {
+ super(type, ImmutableList.copyOf(linkResourceAllocations));
+ }
+}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceListener.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceListener.java
new file mode 100644
index 0000000..11aacc1
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceListener.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 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.onlab.onos.net.resource;
+
+import org.onlab.onos.event.EventListener;
+
+/**
+ * Entity for receiving link resource events.
+ */
+public interface LinkResourceListener extends EventListener<LinkResourceEvent> {
+}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java
index 69cc5c0..b4dfa62 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java
@@ -89,4 +89,18 @@
Iterable<ResourceRequest> getAvailableResources(Link link,
LinkResourceAllocations allocations);
+ /**
+ * Adds a listener for resource related events.
+ *
+ * @param listener listener to add
+ */
+ void addListener(LinkResourceListener listener);
+
+ /**
+ * Removes a listener for resource related events.
+ *
+ * @param listener listener to remove.
+ */
+ void removeListener(LinkResourceListener listener);
+
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java
index 59d1e19..85ee89c 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java
@@ -44,7 +44,7 @@
*
* @param allocations resources to be released
*/
- void releaseResources(LinkResourceAllocations allocations);
+ LinkResourceEvent releaseResources(LinkResourceAllocations allocations);
/**
* Returns resources allocated for an Intent.
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStoreDelegate.java b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStoreDelegate.java
new file mode 100644
index 0000000..be12e04
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStoreDelegate.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 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.onlab.onos.net.resource;
+
+import org.onlab.onos.store.StoreDelegate;
+
+/**
+ * Link resource store delegate abstraction.
+ */
+public interface LinkResourceStoreDelegate extends StoreDelegate<LinkResourceEvent> {
+}