changeset 117:53e31b403815

fix topologyManager
author akahori
date Thu, 06 Dec 2018 23:07:26 +0900
parents 55e11b053234
children daf37151dd97
files src/main/java/christie/topology/manager/NodeInfo.java src/main/java/christie/topology/node/ConfigurationFinish.java src/main/java/christie/topology/node/TopologyNode.java
diffstat 3 files changed, 12 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/topology/manager/NodeInfo.java	Thu Dec 06 02:42:10 2018 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-package christie.topology.manager;
-
-// edgeの情報入れてるだけだからクラス名変えたい.
-public class NodeInfo {
-
-    public String sourceNodeName;
-    public String connectionName;
-    public String targetNodeName;
-
-
-    public NodeInfo(String source, String connection, String target) {
-        this.sourceNodeName = source;
-        this.connectionName = connection;
-        this.targetNodeName = target;
-    }
-
-}
--- a/src/main/java/christie/topology/node/ConfigurationFinish.java	Thu Dec 06 02:42:10 2018 +0900
+++ b/src/main/java/christie/topology/node/ConfigurationFinish.java	Thu Dec 06 23:07:26 2018 +0900
@@ -1,12 +1,16 @@
 package christie.topology.node;
 
 import christie.annotation.Peek;
+import christie.annotation.Take;
 import christie.codegear.CodeGear;
 import christie.codegear.CodeGearManager;
 
 public class ConfigurationFinish extends CodeGear {
 
-    @Peek
+    @Take
+    String reverseNodeName;
+
+    @Take
     int reverseCount;
 
     @Peek
@@ -20,6 +24,8 @@
 
     @Override
     protected void run(CodeGearManager cgm) {
+        reverseCount++;
+        System.out.println(reverseCount + " " + connectNodeNum);
         if (reverseCount == connectNodeNum) {
             getDGM(topologyNodeConfig.getManagerKey()).put("nodePrepareDone", "done");
             cgm.setup(new Start());
@@ -30,9 +36,10 @@
             cgm.setup(new PrepareToClose());
             ClosedEventManager.getInstance().register(DeleteConnection.class);
             ClosedEventManager.getInstance().setKey();*/
-            return;
+
+        }else {
+            getLocalDGM().put("reverseCount", reverseCount);
+            cgm.setup(new ConfigurationFinish());
         }
-
-        cgm.setup(new ConfigurationFinish());
     }
 }
--- a/src/main/java/christie/topology/node/TopologyNode.java	Thu Dec 06 02:42:10 2018 +0900
+++ b/src/main/java/christie/topology/node/TopologyNode.java	Thu Dec 06 23:07:26 2018 +0900
@@ -34,7 +34,7 @@
         getLocalDGM().put("reverseCount", 0);
 
         cgm.setup(new IncomingConnectionInfo());
-        cgm.setup(new IncomingReverseKey());
+        //cgm.setup(new IncomingReverseKey());
         cgm.setup(new ConfigurationFinish());
 
     }