Mercurial > hg > Database > Christie

changeset 79:0a724c973fc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix conffile
author akahori
date Wed, 05 Sep 2018 10:47:04 +0900
parents 046b8bfc7100
children 1e66fd626aff
files src/main/java/christie/test/topology/localTestTopology/LocalTestTopologyConfig.java src/main/java/christie/test/topology/localTestTopology/StartLocalTestTopology.java src/main/java/christie/topology/node/TopologyNodeConfig.java
diffstat 3 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/test/topology/localTestTopology/LocalTestTopologyConfig.java	Wed Sep 05 10:35:46 2018 +0900
+++ b/src/main/java/christie/test/topology/localTestTopology/LocalTestTopologyConfig.java	Wed Sep 05 10:47:04 2018 +0900
@@ -5,12 +5,11 @@
 public class LocalTestTopologyConfig extends Config {
 
     public String hostname = "127.0.0.1";
-    public int connectPort = 10000;
     public String key = "remote";
 
-    public LocalTestTopologyConfig(String[] args,int connectPort, String dsmName) {
+    public LocalTestTopologyConfig(String[] args,int localPort, String dsmName) {
         super(args);
-        this.connectPort = connectPort;
+        this.localPort = localPort;
         key = dsmName;
     }
 
--- a/src/main/java/christie/test/topology/localTestTopology/StartLocalTestTopology.java	Wed Sep 05 10:35:46 2018 +0900
+++ b/src/main/java/christie/test/topology/localTestTopology/StartLocalTestTopology.java	Wed Sep 05 10:47:04 2018 +0900
@@ -22,15 +22,17 @@
         configs.add(new LocalTestTopologyConfig(args, 10001, "node0"));
         configs.add(new LocalTestTopologyConfig(args, 10002, "node1"));
         configs.add(new LocalTestTopologyConfig(args, 10003, "node2"));
-
-        TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(new String[]{"--confFile", "scripts/ring.dot", "--showTime"});
-        CodeGearManager topologyManagerCGM = createCGM(10000);
+        String[] managerArg = {"--localPort", String.valueOf(10000), "--confFile", "scripts/ring.dot", "--showTime"};
+        TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg);
+        CodeGearManager topologyManagerCGM = createCGM(topologyManagerConfig.localPort);
         new StartTopologyManager(topologyManagerCGM, topologyManagerConfig);
 
         for (LocalTestTopologyConfig conf: configs ) {
-            CodeGearManager nodeCGM = createCGM(conf.connectPort);
-            String[] csarg = {"--host","localhost","--localKey",conf.key };
-            TopologyNodeConfig cs  = new TopologyNodeConfig(csarg);
+            CodeGearManager nodeCGM = createCGM(conf.localPort);
+            String[] nodeArg = {"--localKey",conf.key,
+                                "--managerPort", String.valueOf(topologyManagerConfig.localPort),
+                                "--managerHost", "localhost"};
+            TopologyNodeConfig cs  = new TopologyNodeConfig(nodeArg);
 
             new StartTopologyNode(nodeCGM, cs, new LTRemoteIncrement(conf));
         }
--- a/src/main/java/christie/topology/node/TopologyNodeConfig.java	Wed Sep 05 10:35:46 2018 +0900
+++ b/src/main/java/christie/topology/node/TopologyNodeConfig.java	Wed Sep 05 10:47:04 2018 +0900
@@ -12,7 +12,7 @@
     public TopologyNodeConfig(String[] args) {
         super(args);
         for (int i = 0; i< args.length; i++) {
-            if ("--host".equals(args[i])) {
+            if ("--managerHost".equals(args[i])) {
                 setManagerHostName(args[++i]);
             } else if ("--managerKey".equals(args[i])) {
                 setManagerKey(args[++i]);