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

Change-Id: I7963a6896d5a1d6bc4e369627b11b7c8690c1343

@@ -7,6 +7,8 @@ VER=1.3.0-SNAPSHOT
 JAR=~/.m2/repository/org/onosproject/onlab-stc/$VER/onlab-stc-$VER.jar
 JAR=~/.m2/repository/org/onosproject/onlab-stc/$VER/onlab-stc-$VER.jar
 SCENARIOS=$ONOS_ROOT/tools/test/scenarios
 SCENARIOS=$ONOS_ROOT/tools/test/scenarios
 
 
+DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,address=5005,server=y,suspend=y"
+
 scenario=${1:-smoke}
 scenario=${1:-smoke}
 
 
 [ ! -f $scenario ] && scenario=$SCENARIOS/$scenario
 [ ! -f $scenario ] && scenario=$SCENARIOS/$scenario

@@ -309,7 +309,9 @@ public class Compiler {
 
 
         print("dependency name=%s requires=%s", name, requires);
         print("dependency name=%s requires=%s", name, requires);
         Step step = getStep(name, namespace);
         Step step = getStep(name, namespace);
-        processRequirements(step, requires, namespace);
+        if (!inactiveSteps.containsValue(step)) {
+            processRequirements(step, requires, namespace);
+        }
     }
     }
 
 
     /**
     /**

@@ -69,8 +69,8 @@ public class CompilerTest {
         ProcessFlow flow = compiler.processFlow();
         ProcessFlow flow = compiler.processFlow();
 
 
         assertSame("incorrect scenario", scenario, compiler.scenario());
         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",
         assertEquals("incorrect logDir",
                      TEST_DIR.getAbsolutePath() + "/foo", compiler.logDir().getPath());
                      TEST_DIR.getAbsolutePath() + "/foo", compiler.logDir().getPath());