Adding Test functionality for TableFeaturesRequest

Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java
new file mode 100644 (file)
index 0000000..72733a9
--- /dev/null
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestCommandProvider.java
@@ -0,0 +1,146 @@
+package org.opendaylight.openflowplugin.test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.eclipse.osgi.framework.console.CommandInterpreter;
+import org.eclipse.osgi.framework.console.CommandProvider;
+import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import org.opendaylight.controller.md.sal.common.api.data.DataModification;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
+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.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeatures;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
+
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.osgi.framework.BundleContext;
+
+
+public class OpenflowpluginTableFeaturesTestCommandProvider implements CommandProvider {
+
+    private DataBrokerService dataBrokerService;
+    private ProviderContext pc;
+    private final BundleContext ctx;
+    private Table testTable;
+    private Node testNode;
+    private final String originalTableName = "Foo";
+    private final String updatedTableName = "Bar";
+
+    public OpenflowpluginTableFeaturesTestCommandProvider(BundleContext ctx) {
+        this.ctx = ctx;
+    }
+
+    public void onSessionInitiated(ProviderContext session) {
+        pc = session;
+        dataBrokerService = session.getSALService(DataBrokerService.class);
+        ctx.registerService(CommandProvider.class.getName(), this, null);
+        createTestNode();
+        createTestTable();
+    }
+
+    private void createUserNode(String nodeRef) {        
+        NodeBuilder builder = new NodeBuilder();
+        builder.setId(new NodeId(nodeRef));
+        builder.setKey(new NodeKey(builder.getId()));
+        testNode = builder.build();
+    }
+    
+    private void createTestNode() {       
+        NodeBuilder builder = new NodeBuilder();
+        builder.setId(new NodeId(OpenflowpluginTestActivator.NODE_ID));
+        builder.setKey(new NodeKey(builder.getId()));
+        testNode = builder.build();
+    }
+
+    private InstanceIdentifier<Node> nodeToInstanceId(Node node) {
+        return InstanceIdentifier.builder(Nodes.class).child(Node.class, node.getKey()).toInstance();
+    }
+
+    private TableBuilder createTestTable() {
+        // Sample data , committing to DataStore
+        DataModification modification = dataBrokerService.beginTransaction();
+        short id = 12;
+        TableKey key = new TableKey(id) ;
+        
+        TableBuilder table = new TableBuilder();
+        
+        table.setId(id) ;
+        table.setKey(key) ;
+ 
+              
+        // Send empty table features
+        List<TableFeatures> features = new ArrayList<TableFeatures>() ;
+        table.setTableFeatures(features) ;
+                
+        testTable = table.build();
+        return table;
+    }
+
+    
+    private void writeTable(CommandInterpreter ci, Table table) {
+        DataModification modification = dataBrokerService.beginTransaction();
+               
+        InstanceIdentifier<Table> path1 = InstanceIdentifier.builder(Nodes.class)
+                .child(Node.class, testNode.getKey()).augmentation(FlowCapableNode.class).child(Table.class, new TableKey(table.getId())).build() ;
+                
+                        
+        modification.putOperationalData(nodeToInstanceId(testNode), testNode);
+        modification.putOperationalData(path1, table);
+        modification.putConfigurationData(nodeToInstanceId(testNode), testNode);
+        modification.putConfigurationData(path1, table);
+        Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();
+        try {
+            RpcResult<TransactionStatus> result = commitFuture.get();
+            TransactionStatus status = result.getResult();
+            ci.println("Status of Table Data Loaded Transaction: " + status);
+
+        } catch (InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void _modifyTable(CommandInterpreter ci) {
+        String nref = ci.nextArgument();
+        ci.println( " Table Command Provider modify" ) ;
+        
+        if (nref == null) {
+            ci.println("test node added");
+            createTestNode();
+        } else {
+            ci.println("User node added" + nref);
+            createUserNode(nref);
+        }
+        TableBuilder table = createTestTable(); 
+           
+        writeTable(ci, table.build());
+    }
+    
+    @Override
+    public String getHelp() {
+        StringBuffer help = new StringBuffer();
+        help.append("---FRM MD-SAL Table test module---\n");
+        help.append("\t modifyTable <node id>        - node ref\n");
+               
+        return help.toString();
+    }    
+   
+}
+

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.xtend b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.xtend
new file mode 100644 (file)
index 0000000..a19d191
--- /dev/null
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.xtend
@@ -0,0 +1,71 @@
+/*
+ * 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 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 org.opendaylight.controller.sal.binding.api.data.DataProviderService
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.SalTableService
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.SalTableService
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.UpdateTableInput
+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.yang.binding.InstanceIdentifier
+import org.slf4j.LoggerFactory
+
+
+class OpenflowpluginTableFeaturesTestServiceProvider implements AutoCloseable, SalTableService {
+
+
+    static val LOG = LoggerFactory.getLogger(OpenflowpluginTableFeaturesTestServiceProvider);
+    
+    @Property
+    RoutedRpcRegistration<SalTableService> tableRegistration;
+        
+
+    @Property
+    NotificationProviderService notificationService;
+
+
+    def void start() {
+        LOG.info("SalTableServiceProvider Started.");
+        
+    }
+
+
+    override close() {
+       LOG.info("SalTableServiceProvider stopped.");
+        tableRegistration.close;
+    }
+    
+      
+    override updateTable(UpdateTableInput input) {
+        LOG.info("updateTable - " + input);
+        return null;
+    }
+    
+    
+    def CompositeObjectRegistration<OpenflowpluginTableFeaturesTestServiceProvider> register(ProviderContext ctx) {
+        val builder = CompositeObjectRegistration
+                .<OpenflowpluginTableFeaturesTestServiceProvider> builderFor(this);
+
+        tableRegistration = ctx.addRoutedRpcImplementation(SalTableService, this);
+        val nodeIndentifier = InstanceIdentifier.builder(Nodes).child(Node, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)));
+        tableRegistration.registerPath(NodeContext, nodeIndentifier.toInstance());
+        builder.add(tableRegistration);
+
+        return builder.toInstance();
+    }
+    
+}
\ No newline at end of file

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.xtend b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.xtend
index d068c651f82725fc52b56261f4ede1b3921a7dc1..7b211bc7d9220ced5af90fa36c62e96337413e93 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.xtend
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.xtend
@@ -18,9 +18,11 @@ class OpenflowpluginTestActivator extends AbstractBindingAwareProvider {
     static var OpenflowpluginTestServiceProvider provider = new OpenflowpluginTestServiceProvider();
     static var OpenflowpluginGroupTestServiceProvider groupProvider = new OpenflowpluginGroupTestServiceProvider();
     static var OpenflowpluginMeterTestServiceProvider meterProvider = new OpenflowpluginMeterTestServiceProvider();
+    static var OpenflowpluginTableFeaturesTestServiceProvider tableProvider = new OpenflowpluginTableFeaturesTestServiceProvider();
     var OpenflowpluginTestCommandProvider cmdProvider;
     var OpenflowpluginGroupTestCommandProvider cmdGroupProvider;
     var OpenflowpluginMeterTestCommandProvider cmdMeterProvider;
+    var OpenflowpluginTableFeaturesTestCommandProvider cmdTableProvider;
     public static final String NODE_ID =  "foo:node:1";
 
     override onSessionInitiated(ProviderContext session) {
@@ -30,9 +32,11 @@ class OpenflowpluginTestActivator extends AbstractBindingAwareProvider {
         provider.register(session);
         groupProvider.register(session);
         meterProvider.register(session);
+        tableProvider.register(session);
         cmdProvider.onSessionInitiated(session);
         cmdGroupProvider.onSessionInitiated(session);
         cmdMeterProvider.onSessionInitiated(session);
+        cmdTableProvider.onSessionInitiated(session);
     }
     
     override startImpl(BundleContext ctx) {
@@ -40,6 +44,7 @@ class OpenflowpluginTestActivator extends AbstractBindingAwareProvider {
         cmdProvider = new OpenflowpluginTestCommandProvider(ctx);
         cmdGroupProvider = new OpenflowpluginGroupTestCommandProvider(ctx);
         cmdMeterProvider = new OpenflowpluginMeterTestCommandProvider(ctx);
+        cmdTableProvider = new OpenflowpluginTableFeaturesTestCommandProvider(ctx);
     }
 
     override protected stopImpl(BundleContext context) {