Modify CliRenderer, CliBuilder, CliTrigger and TelnetUtils.

Change-Id: Ib6254e45f60313d84831c00ad4d2f67c4f965f3f
Signed-off-by: Shixing Liu <liushixing@huawei.com>

diff --git a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliBuilder.java b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliBuilder.java
index 97f29cfe0cbf4d27093a3004b2380b5a110b9831..b2f495782c50e9e411fc143f22fe612c80779724 100644 (file)
--- a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliBuilder.java
+++ b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliBuilder.java
@@ -39,9 +39,7 @@ import java.util.*;
  *\r
  * @author Shixing Liu\r
  */\r
-\r
 public class CliBuilder implements AutoCloseable {\r
-\r
     private static final Logger LOG = LoggerFactory.getLogger(CliBuilder.class);\r
 \r
     private final DataBroker dataProvider;\r
@@ -54,14 +52,16 @@ public class CliBuilder implements AutoCloseable {
      * @param dataProvider\r
      */\r
     public CliBuilder(DataBroker dataProvider) {\r
-\r
         super();\r
+\r
         this.dataProvider = dataProvider;\r
 \r
         LOG.info("New TelnetUtils.");\r
         telnetUtils = new TelnetUtils();\r
 \r
         LOG.info("Initialized CliBuilder.");\r
+\r
+               return;\r
     }\r
 \r
     /**\r
@@ -70,8 +70,10 @@ public class CliBuilder implements AutoCloseable {
      */\r
     public void init(List<PhysicalNode> physicalNodes) {\r
         for ( PhysicalNode physicalNode : physicalNodes ) {\r
-            //TODO:\r
+            // TODO:\r
         }\r
+\r
+               return;\r
     }\r
 \r
     /**\r
@@ -116,7 +118,6 @@ public class CliBuilder implements AutoCloseable {
         return  vnPnMappingResultforNode;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param connection\r
@@ -146,7 +147,6 @@ public class CliBuilder implements AutoCloseable {
         return  isTwoExtGroup;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param physicalLinkId\r
@@ -201,7 +201,6 @@ public class CliBuilder implements AutoCloseable {
         return  physicalPortId;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param physicalLinkId\r
@@ -229,7 +228,6 @@ public class CliBuilder implements AutoCloseable {
         return  physicalNodeId;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param physicalLinkId\r
@@ -257,7 +255,6 @@ public class CliBuilder implements AutoCloseable {
         return  physicalPortId;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param onePhysicalNodeId\r
@@ -334,7 +331,6 @@ public class CliBuilder implements AutoCloseable {
         return physicalPath1;\r
     }\r
 \r
-\r
     /**\r
      *\r
      */\r
@@ -488,7 +484,6 @@ public class CliBuilder implements AutoCloseable {
         return  peersOfPEs;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param oneNode\r
@@ -514,7 +509,6 @@ public class CliBuilder implements AutoCloseable {
         return  Boolean.FALSE;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param peersList\r
@@ -551,7 +545,6 @@ public class CliBuilder implements AutoCloseable {
         return  Boolean.TRUE;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param physicalNodeId\r
@@ -589,7 +582,6 @@ public class CliBuilder implements AutoCloseable {
         return  template;\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param peersList\r
@@ -832,7 +824,6 @@ public class CliBuilder implements AutoCloseable {
 \r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param user\r
@@ -939,17 +930,16 @@ public class CliBuilder implements AutoCloseable {
         }\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @throws Exception\r
      */\r
+       @Override\r
     public void close() throws Exception {\r
-\r
         if (telnetUtils != null){\r
             telnetUtils.close();\r
         }\r
-    }\r
-\r
 \r
+               return;\r
+    }\r
 }\r

diff --git a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliRenderer.java b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliRenderer.java
index 1bd6fa28079768b702b5d939728dba41de67724f..e75bcd52f702a804eb595a321e9cb4cbdc3c6242 100644 (file)
--- a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliRenderer.java
+++ b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliRenderer.java
@@ -33,6 +33,7 @@ public class CliRenderer implements AutoCloseable {
      */\r
        public CliRenderer(DataBroker dataBroker) {\r
                super();\r
+\r
         this.dataBroker = dataBroker;\r
 \r
         LOG.debug("new PhysicalResourceLoader.");\r
@@ -43,7 +44,7 @@ public class CliRenderer implements AutoCloseable {
 \r
                LOG.info("Initialized cli renderer.");\r
 \r
-               return;\r
+        return;\r
     }\r
 \r
     /**\r
@@ -55,6 +56,7 @@ public class CliRenderer implements AutoCloseable {
         if (physicalResourceLoader != null){\r
             physicalResourceLoader.close();\r
         }\r
+\r
         if (cliTrigger != null){\r
             cliTrigger.close();\r
         }\r

diff --git a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliTrigger.java b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliTrigger.java
index 8be39e04fc668bc22383eb3d156abe18f837056a..294ecd7d1c1e15b59d38526e7900fefec9f0150b 100644 (file)
--- a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliTrigger.java
+++ b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/CliTrigger.java
@@ -9,23 +9,12 @@
 package org.opendaylight.nemo.renderer.cli;\r
 \r
 import com.google.common.base.Optional;\r
-import com.google.common.util.concurrent.FutureCallback;\r
-import com.google.common.util.concurrent.Futures;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-import java.util.concurrent.Executors;\r
-import java.util.concurrent.ScheduledExecutorService;\r
-import com.google.common.util.concurrent.CheckedFuture;\r
-\r
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;\r
 import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;\r
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;\r
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;\r
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;\r
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;\r
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;\r
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;\r
-\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.generic.physical.network.rev151010.PhysicalNetwork;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.generic.physical.network.rev151010.physical.network.PhysicalNodes;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.generic.physical.network.rev151010.physical.network.physical.nodes.PhysicalNode;\r
@@ -37,30 +26,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.intent.m
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.intent.mapping.result.rev151010.intent.vn.mapping.results.UserIntentVnMapping;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.intent.mapping.result.rev151010.intent.vn.mapping.results.UserIntentVnMappingKey;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.intent.mapping.result.rev151010.vn.pn.mapping.results.UserVnPnMapping;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.engine.common.rev151010.VirtualNetworkId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.engine.common.rev151010.VirtualNetworkId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.Users;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.UserKey;\r
-\r
 import org.opendaylight.yangtools.concepts.ListenerRegistration;\r
 import org.opendaylight.yangtools.yang.binding.DataObject;\r
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;\r
-\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
+import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-\r
 /**\r
  *\r
  * @author Shixing Liu\r
  */\r
 public class CliTrigger implements AutoCloseable {\r
-\r
     private static final Logger LOG = LoggerFactory.getLogger(CliTrigger.class);\r
+\r
     private final DataBroker dataProvider;\r
     private ListenerRegistration<DataChangeListener> userVnPnMappingChangeListenerReg;\r
     private final CliBuilder cliBuilder;\r
@@ -70,13 +57,14 @@ public class CliTrigger implements AutoCloseable {
      * @param dataProvider\r
      */\r
     public CliTrigger(DataBroker dataProvider) {\r
-\r
         super();\r
 \r
         this.dataProvider = dataProvider;\r
         cliBuilder = new CliBuilder(dataProvider);\r
-        //register  listener\r
+\r
+        // Register listener\r
         registerUserVnPnMappingListener();\r
+\r
         LOG.info("Initialized CliTrigger.");\r
     }\r
 \r
@@ -213,7 +201,7 @@ public class CliTrigger implements AutoCloseable {
 \r
 \r
     /**\r
-     *\r
+     * A listener implementation.\r
      */\r
     private class UserVnPnMappingChangeListener implements DataChangeListener {\r
 \r
@@ -266,7 +254,7 @@ public class CliTrigger implements AutoCloseable {
                         UserVnPnMapping userVnPnMapping = (UserVnPnMapping)dataObject;\r
                         UserId userId = userVnPnMapping.getUserId();\r
 \r
-                        //TO DO :flowUtils.deleteFlowEntries(userId);??????\r
+                        // TODO: flowUtils.deleteFlowEntries(userId);??????\r
 \r
                         User user = getUser(userId);\r
                         VirtualNetwork virtualNetwork = getVirtualNetwork(userId);\r
@@ -288,7 +276,6 @@ public class CliTrigger implements AutoCloseable {
             Map<InstanceIdentifier<?>, DataObject> originalData = change.getOriginalData();\r
             Set<InstanceIdentifier<?>> removedPaths = change.getRemovedPaths();\r
             if ( null != removedPaths && !removedPaths.isEmpty() ) {\r
-\r
                 DataObject dataObject;\r
 \r
                 for ( InstanceIdentifier<?> instanceId : removedPaths ) {\r
@@ -296,19 +283,18 @@ public class CliTrigger implements AutoCloseable {
                     if ( null != dataObject && dataObject instanceof UserVnPnMapping ) {\r
                         UserVnPnMapping userVnPnMapping = (UserVnPnMapping)dataObject;\r
 \r
-                        //TO DO\r
-                        //flowUtils.deleteFlowEntries(userVnPnMapping.getUserId());\r
+                        // TODO\r
+                        // flowUtils.deleteFlowEntries(userVnPnMapping.getUserId());\r
                     }\r
                 }\r
             }\r
-            return;\r
 \r
+            return;\r
         }\r
     }\r
 \r
-\r
+    @Override\r
     public void close() throws Exception {\r
-\r
         if ( null != this.userVnPnMappingChangeListenerReg ) {\r
             this.userVnPnMappingChangeListenerReg.close();\r
         }\r
@@ -316,5 +302,7 @@ public class CliTrigger implements AutoCloseable {
         if(null != this.cliBuilder){\r
             this.cliBuilder.close();\r
         }\r
+\r
+               return;\r
     }\r
-}
\ No newline at end of file
+}\r

diff --git a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
index e4671786f265b371c28c11f576835d216c0f2651..94eda81014600e67511b26cb4cca7838abf09e87 100644 (file)
--- a/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
+++ b/nemo-renderers/cli-renderer/src/main/java/org/opendaylight/nemo/renderer/cli/TelnetUtils.java
@@ -9,28 +9,21 @@
 package org.opendaylight.nemo.renderer.cli;\r
 \r
 import org.jboss.netty.bootstrap.ClientBootstrap;\r
-import org.jboss.netty.channel.ChannelFactory;\r
-import org.jboss.netty.channel.ChannelPipeline;\r
-import org.jboss.netty.channel.ChannelPipelineFactory;\r
-import org.jboss.netty.channel.Channels;\r
-import org.jboss.netty.buffer.ChannelBuffer;\r
+import org.jboss.netty.channel.*;\r
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;\r
 import org.jboss.netty.handler.codec.string.StringDecoder;\r
 import org.jboss.netty.handler.codec.string.StringEncoder;\r
-import org.jboss.netty.channel.*;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 import java.net.InetSocketAddress;\r
 import java.util.concurrent.Executors;\r
 \r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
-\r
 /**\r
  *\r
  * @author Shixing Liu\r
  */\r
 public class TelnetUtils implements AutoCloseable {\r
-\r
     private static final Logger LOG = LoggerFactory.getLogger(TelnetUtils.class);\r
 \r
     private static Boolean ClearOver = Boolean.TRUE;\r
@@ -43,7 +36,6 @@ public class TelnetUtils implements AutoCloseable {
      *\r
      */\r
     public TelnetUtils(){\r
-\r
         LOG.info("TelnetUtils constructor");\r
     }\r
 \r
@@ -52,7 +44,9 @@ public class TelnetUtils implements AutoCloseable {
      * @throws Exception\r
      */\r
     public void close() throws Exception {\r
+        // TODO\r
 \r
+               return;\r
     }\r
 \r
     /**\r
@@ -209,14 +203,13 @@ public class TelnetUtils implements AutoCloseable {
     /**\r
      *\r
      */\r
-    private static class ClientHandlerForClearOldConfig extends SimpleChannelUpstreamHandler  {\r
+    private static class ClientHandlerForClearOldConfig extends SimpleChannelUpstreamHandler {\r
         @Override\r
         public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) {\r
         }\r
 \r
         @Override\r
         public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)throws Exception {\r
-\r
             String str = (String)(e.getMessage());\r
             System.out.println(e.getMessage());\r
             if(str.contains("Username")){\r
@@ -262,7 +255,6 @@ public class TelnetUtils implements AutoCloseable {
      *\r
      */\r
     private static void sendNewConfig(){\r
-\r
         ChannelFactory factory = new NioClientSocketChannelFactory(\r
                 Executors.newCachedThreadPool(),\r
                 Executors.newCachedThreadPool());\r
@@ -293,7 +285,6 @@ public class TelnetUtils implements AutoCloseable {
         bootstrap.connect(new InetSocketAddress(ipAddress, 23));\r
     }\r
 \r
-\r
     /**\r
      *\r
      * @param deviceName\r
@@ -314,14 +305,13 @@ public class TelnetUtils implements AutoCloseable {
     /**\r
      *\r
      */\r
-    private static class ClientHandlerForSendNewConfig extends SimpleChannelUpstreamHandler  {\r
+    private static class ClientHandlerForSendNewConfig extends SimpleChannelUpstreamHandler {\r
         @Override\r
         public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) {\r
         }\r
 \r
         @Override\r
         public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {\r
-\r
             String str = (String)(e.getMessage());\r
             System.out.println(e.getMessage());\r
             if(str.contains("Username")){\r
@@ -348,6 +338,4 @@ public class TelnetUtils implements AutoCloseable {
             e.getChannel().close();\r
         }\r
     }\r
-\r
-\r
-}
\ No newline at end of file
+}\r