-/**
+/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
- *
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.test;
-import java.util.concurrent.Future;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yangtools.concepts.CompositeObjectRegistration;
-import org.opendaylight.yangtools.concepts.CompositeObjectRegistration.CompositeObjectRegistrationBuilder;
+import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class OpenflowpluginTestServiceProvider implements AutoCloseable,
- SalFlowService {
+public class OpenflowpluginTestServiceProvider implements AutoCloseable, SalFlowService {
+ private static final Logger LOG = LoggerFactory.getLogger(OpenflowpluginTestServiceProvider.class);
- private final static Logger LOG = LoggerFactory
- .getLogger(OpenflowpluginTestServiceProvider.class);
+ private final DataBroker dataService;
+ private final NotificationPublishService notificationProviderService;
- private DataBroker dataService;
- private RoutedRpcRegistration<SalFlowService> flowRegistration;
- private NotificationProviderService notificationProviderService;
+ private ObjectRegistration<SalFlowService> flowRegistration = null;
+
+ public OpenflowpluginTestServiceProvider(final DataBroker dataService,
+ final NotificationPublishService notificationProviderService) {
+ this.dataService = dataService;
+ this.notificationProviderService = notificationProviderService;
+ }
/**
- * get data service
- *
+ * Get data service.
+ *
* @return {@link #dataService}
*/
public DataBroker getDataService() {
}
/**
- * set {@link #dataService}
- *
- * @param dataService
- */
- public void setDataService(final DataBroker dataService) {
- this.dataService = dataService;
- }
-
- /**
- * get flow registration
- *
+ * Get flow registration.
+ *
* @return {@link #flowRegistration}
*/
- public RoutedRpcRegistration<SalFlowService> getFlowRegistration() {
+ public ObjectRegistration<SalFlowService> getFlowRegistration() {
return flowRegistration;
}
/**
- * set {@link #flowRegistration}
- *
- * @param flowRegistration
+ * Set {@link #flowRegistration}.
*/
- public void setFlowRegistration(
- final RoutedRpcRegistration<SalFlowService> flowRegistration) {
+ public void setFlowRegistration(final ObjectRegistration<SalFlowService> flowRegistration) {
this.flowRegistration = flowRegistration;
}
/**
- * get notification service
- *
+ * Get notification service.
+ *
* @return {@link #notificationProviderService}
*/
- public NotificationProviderService getNotificationService() {
+ public NotificationPublishService getNotificationService() {
return notificationProviderService;
}
- /**
- * set {@link #notificationProviderService}
- *
- * @param notificationProviderService
- */
- public void setNotificationService(
- final NotificationProviderService notificationProviderService) {
- this.notificationProviderService = notificationProviderService;
- }
-
- public void start() {
- OpenflowpluginTestServiceProvider.LOG
- .info("SalFlowServiceProvider Started.");
- }
-
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.AutoCloseable#close()
*/
@Override
- public void close() throws Exception {
+ public void close() {
OpenflowpluginTestServiceProvider.LOG
.info("SalFlowServiceProvide stopped.");
flowRegistration.close();
/*
* (non-Javadoc)
- *
+ *
* @see
* org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.
* SalFlowService
* service.rev130819.AddFlowInput)
*/
@Override
- public Future<RpcResult<AddFlowOutput>> addFlow(AddFlowInput input) {
- String plus = ("addFlow - " + input);
- OpenflowpluginTestServiceProvider.LOG.info(plus);
+ public ListenableFuture<RpcResult<AddFlowOutput>> addFlow(final AddFlowInput input) {
+ OpenflowpluginTestServiceProvider.LOG.info("addFlow - {}", input);
return null;
}
/*
* (non-Javadoc)
- *
+ *
* @see
* org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.
* SalFlowService
* .service.rev130819.RemoveFlowInput)
*/
@Override
- public Future<RpcResult<RemoveFlowOutput>> removeFlow(RemoveFlowInput input) {
- String plus = ("removeFlow - " + input);
- OpenflowpluginTestServiceProvider.LOG.info(plus);
+ public ListenableFuture<RpcResult<RemoveFlowOutput>> removeFlow(final RemoveFlowInput input) {
+ OpenflowpluginTestServiceProvider.LOG.info("removeFlow - {}", input);
return null;
}
/*
* (non-Javadoc)
- *
+ *
* @see
* org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.
* SalFlowService
* .service.rev130819.UpdateFlowInput)
*/
@Override
- public Future<RpcResult<UpdateFlowOutput>> updateFlow(UpdateFlowInput input) {
- String plus = ("updateFlow - " + input);
- OpenflowpluginTestServiceProvider.LOG.info(plus);
+ public ListenableFuture<RpcResult<UpdateFlowOutput>> updateFlow(final UpdateFlowInput input) {
+ OpenflowpluginTestServiceProvider.LOG.info("updateFlow - {}", input);
return null;
}
- /**
- * @param ctx
- * @return {@link CompositeObjectRegistrationBuilder #toInstance()}
- */
- public CompositeObjectRegistration<OpenflowpluginTestServiceProvider> register(
- final ProviderContext ctx) {
- CompositeObjectRegistrationBuilder<OpenflowpluginTestServiceProvider> builder = CompositeObjectRegistration
- .<OpenflowpluginTestServiceProvider> builderFor(this);
-
- RoutedRpcRegistration<SalFlowService> addRoutedRpcImplementation = ctx
- .<SalFlowService> addRoutedRpcImplementation(
- SalFlowService.class, this);
-
- setFlowRegistration(addRoutedRpcImplementation);
-
- InstanceIdentifierBuilder<Nodes> builderII = InstanceIdentifier
- .<Nodes> builder(Nodes.class);
-
- NodeId nodeId = new NodeId(OpenflowpluginTestActivator.NODE_ID);
- NodeKey nodeKey = new NodeKey(nodeId);
-
- InstanceIdentifierBuilder<Node> nodeIdentifier = builderII
- .<Node, NodeKey> child(Node.class, nodeKey);
-
- InstanceIdentifier<Node> instance = nodeIdentifier.build();
-
- flowRegistration.registerPath(NodeContext.class, instance);
-
- RoutedRpcRegistration<SalFlowService> flowRegistration2 = getFlowRegistration();
-
- builder.add(flowRegistration2);
-
- return builder.build();
+ public ObjectRegistration<OpenflowpluginTestServiceProvider> register(final RpcProviderService rpcRegistry) {
+ setFlowRegistration(rpcRegistry.registerRpcImplementation(SalFlowService.class, this, ImmutableSet.of(
+ InstanceIdentifier.create(Nodes.class)
+ .child(Node.class, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID))))));
+
+ return new AbstractObjectRegistration<>(this) {
+ @Override
+ protected void removeRegistration() {
+ flowRegistration.close();
+ }
+ };
}
}
Code Review / openflowplugin.git / blobdiff