commit 177ece60f3a9de6c0cd00b211f05c429979a634d
author Thomas Vachuska <tom@onlab.us> Fri Jun 26 00:18:21 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 26 07:28:23 2015 +0000
tree 7f55fa4c413a97dab89519087be17c959e9cb0b0
parent afdf4de12eb4cbb6a80b96e2ab602be596bb4673

Fixed STC defect where a dependency would bring out an otherwise inactive step.

Change-Id: I7963a6896d5a1d6bc4e369627b11b7c8690c1343

utils/stc/src/main/java/org/onlab/stc/Compiler.java

diff --git a/utils/stc/src/main/java/org/onlab/stc/Compiler.java b/utils/stc/src/main/java/org/onlab/stc/Compiler.java
index 2a8a2ce..4d68962 100644
--- a/utils/stc/src/main/java/org/onlab/stc/Compiler.java
+++ b/utils/stc/src/main/java/org/onlab/stc/Compiler.java
@@ -309,7 +309,9 @@
 
         print("dependency name=%s requires=%s", name, requires);
         Step step = getStep(name, namespace);
-        processRequirements(step, requires, namespace);
+        if (!inactiveSteps.containsValue(step)) {
+            processRequirements(step, requires, namespace);
+        }
     }
 
     /**

utils/stc/src/test/java/org/onlab/stc/CompilerTest.java

diff --git a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
index 7963d1f..35b200b 100644
--- a/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
+++ b/utils/stc/src/test/java/org/onlab/stc/CompilerTest.java
@@ -69,8 +69,8 @@
         ProcessFlow flow = compiler.processFlow();
 
         assertSame("incorrect scenario", scenario, compiler.scenario());
-        assertEquals("incorrect step count", 25, flow.getVertexes().size());
-        assertEquals("incorrect dependency count", 21, flow.getEdges().size());
+        assertEquals("incorrect step count", 24, flow.getVertexes().size());
+        assertEquals("incorrect dependency count", 17, flow.getEdges().size());
         assertEquals("incorrect logDir",
                      TEST_DIR.getAbsolutePath() + "/foo", compiler.logDir().getPath());