changeset 162:d19c85796cdd

fix treetest
author akahori
date Tue, 22 Jan 2019 14:21:37 +0900
parents 5c5a5da0d13d
children c94a4b1b8f36
files src/main/java/christie/test/topology/treeTestTopology/ChildCodeGear.java src/main/java/christie/test/topology/treeTestTopology/ParentCodeGear.java
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/test/topology/treeTestTopology/ChildCodeGear.java	Tue Jan 22 14:21:15 2019 +0900
+++ b/src/main/java/christie/test/topology/treeTestTopology/ChildCodeGear.java	Tue Jan 22 14:21:37 2019 +0900
@@ -3,20 +3,20 @@
 import christie.annotation.Peek;
 import christie.codegear.CodeGear;
 import christie.codegear.CodeGearManager;
+import christie.topology.TopologyDataGear;
 
 import java.util.List;
 
 public class ChildCodeGear  extends CodeGear {
-    @Peek
-    String nodeName;
 
     @Peek
-    List<String> _CLIST;
+    TopologyDataGear topoDG;
 
     @Override
     protected void run(CodeGearManager cgm) {
+        List<String> _CLIST = topoDG.getConnectionList();
         if(_CLIST.contains("parent")) {
-            getDGM("parent").put("childNodeName", nodeName);
+            getDGM("parent").put("childNodeName", topoDG.getNodeName());
         }else{
             getLocalDGM().put("countNodeNum", 1);
             cgm.setup(new ParentCodeGear());
--- a/src/main/java/christie/test/topology/treeTestTopology/ParentCodeGear.java	Tue Jan 22 14:21:15 2019 +0900
+++ b/src/main/java/christie/test/topology/treeTestTopology/ParentCodeGear.java	Tue Jan 22 14:21:37 2019 +0900
@@ -4,11 +4,12 @@
 import christie.annotation.Take;
 import christie.codegear.CodeGear;
 import christie.codegear.CodeGearManager;
+import christie.topology.TopologyDataGear;
 import christie.topology.node.TopologyNodeConfig;
 
 public class ParentCodeGear extends CodeGear{
     @Peek
-    String nodeName;
+    TopologyDataGear topoDG;
 
     @Peek
     int maxNodeNum;
@@ -24,7 +25,7 @@
 
     @Override
     protected void run(CodeGearManager cgm) {
-        System.out.println(nodeName + " : " + childNodeName + " accept");
+        System.out.println(topoDG.getNodeName() + " : " + childNodeName + " accept");
         if(countNodeNum == maxNodeNum){
             getDGM(topologyNodeConfig.getManagerKey()).put("finish", "");
         }else{