diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java index d72dab9ddc..2c6407f147 100644 --- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java +++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java @@ -46,7 +46,7 @@ import org.onosproject.net.intent.OpticalCircuitIntent; import org.onosproject.net.intent.OpticalConnectivityIntent; import org.onosproject.net.intent.PointToPointIntent; import org.onosproject.net.newresource.ResourceService; -import org.onosproject.net.resource.device.DeviceResourceService; +import org.onosproject.net.resource.device.DeviceResourceStore; import org.onosproject.net.resource.link.LinkResourceAllocations; import org.onosproject.net.resource.link.LinkResourceService; import org.onosproject.net.topology.LinkWeight; @@ -98,7 +98,7 @@ public class OpticalPathProvisioner { protected DeviceService deviceService; @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - protected DeviceResourceService deviceResourceService; + protected DeviceResourceStore deviceResourceStore; @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) protected LinkResourceService linkResourceService; @@ -385,7 +385,7 @@ public class OpticalPathProvisioner { } } else if (intent instanceof OpticalCircuitIntent) { resourceService.release(intent.id()); - deviceResourceService.releaseMapping(intent.id()); + deviceResourceStore.releaseMapping(intent.id()); if (lra != null) { linkResourceService.releaseResources(lra); } diff --git a/core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceService.java b/core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceService.java deleted file mode 100644 index 0fdaa15efd..0000000000 --- a/core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceService.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2015 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.resource.device; - -import com.google.common.annotations.Beta; -import org.onosproject.net.intent.IntentId; - -import java.util.Set; - -/** - * Service for providing device resources. - */ -@Beta -public interface DeviceResourceService { - - /** - * Request a mapping between the given intents. - * - * @param keyIntentId the key intent ID - * @param valIntentId the value intent ID - * @return true if mapping was successful, false otherwise - */ - boolean requestMapping(IntentId keyIntentId, IntentId valIntentId); - - /** - * Returns the intents mapped to a lower intent. - * - * @param intentId the intent ID - * @return the set of intent IDs - */ - Set getMapping(IntentId intentId); - - /** - * Release mapping of given intent. - * - * @param intentId intent ID - */ - void releaseMapping(IntentId intentId); -} diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java index de41acf83d..a54c92d436 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java @@ -52,7 +52,7 @@ import org.onosproject.net.intent.impl.IntentCompilationException; import org.onosproject.net.newresource.ResourceAllocation; import org.onosproject.net.newresource.ResourcePath; import org.onosproject.net.newresource.ResourceService; -import org.onosproject.net.resource.device.DeviceResourceService; +import org.onosproject.net.resource.device.DeviceResourceStore; import org.onosproject.net.resource.link.LinkResourceAllocations; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; @@ -98,7 +98,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler mapping = deviceResourceService.getMapping(resource); + Set mapping = deviceResourceStore.getMapping(resource); if (mapping == null) { return true; diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/DeviceResourceManager.java b/core/net/src/main/java/org/onosproject/net/resource/impl/DeviceResourceManager.java deleted file mode 100644 index f6dbc603b0..0000000000 --- a/core/net/src/main/java/org/onosproject/net/resource/impl/DeviceResourceManager.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2015 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.resource.impl; - -import org.apache.felix.scr.annotations.Activate; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Deactivate; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.apache.felix.scr.annotations.Service; -import org.onosproject.net.intent.IntentId; -import org.onosproject.net.resource.device.DeviceResourceService; -import org.onosproject.net.resource.device.DeviceResourceStore; -import org.slf4j.Logger; - -import java.util.Set; - -import static org.slf4j.LoggerFactory.getLogger; - -/** - * Provides basic implementation of device resources allocation. - */ -@Component(immediate = true) -@Service -public class DeviceResourceManager implements DeviceResourceService { - - private final Logger log = getLogger(getClass()); - - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - private DeviceResourceStore store; - - @Activate - public void activate() { - log.info("Started"); - } - - @Deactivate - public void deactivate() { - log.info("Stopped"); - } - - @Override - public void releaseMapping(IntentId intentId) { - store.releaseMapping(intentId); - } - - @Override - public boolean requestMapping(IntentId keyIntentId, IntentId valIntentId) { - return store.allocateMapping(keyIntentId, valIntentId); - } - - @Override - public Set getMapping(IntentId intentId) { - return store.getMapping(intentId); - } -}