Enhancing STC

Change-Id: Ibb8a001f5c6550860c4ade97378af7e97876a0ab

@@ -13,7 +13,8 @@ cat $aux
 cut -c7- $aux | cut -d\  -f1 | sort > $aux.1
 cut -c7- $aux | cut -d\  -f1 | sort > $aux.1
 
 
 # Normalize the expected apps
 # Normalize the expected apps
-apps=${ONOS_APPS:-drivers,openflow}
+apps=${2:-$ONOS_APPS}
+apps=${apps:-drivers,openflow}
 (for app in ${apps//,/ }; do echo org.onosproject.$app; done) | sort > $aux.2
 (for app in ${apps//,/ }; do echo org.onosproject.$app; done) | sort > $aux.2
 
 
 # Check for differences
 # Check for differences

+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Checks whether all and only the ONOS instances configured active.
+# -----------------------------------------------------------------------------
+
+aux=/tmp/stc-$$.log
+trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
+
+onos ${1:-$OCI} "onos:nodes" > $aux
+cat $aux
+
+# Normalize the nodes
+cut -d= -f3 $aux | cut -d: -f1 | sort > $aux.1
+
+# Normalize the expected apps
+ONOS_NODES=$(env | egrep "OC[0-9]*=" | cut -d= -f2 | sort)
+nodes=${2:-$ONOS_NODES}
+(for node in $nodes; do echo $node; done) | sort > $aux.2
+
+# Check for differences
+diff $aux.1 $aux.2

+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Untars ONOS tar.gz on the remote machine and runs ONOS.
+# -----------------------------------------------------------------------------
+
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. $ONOS_ROOT/tools/build/envDefaults
+
+node=${1:-$OCI}
+remote=$ONOS_USER@$node
+
+ssh $remote "
+    [ -d $ONOS_INSTALL_DIR/bin ] && echo \"ONOS is already installed\" && exit 1
+    cd /tmp && rm -fr /tmp/$ONOS_BITS
+    tar zxf /tmp/$ONOS_BITS.tar.gz
+
+    cd /tmp/$ONOS_BITS
+    bin/onos-service server 1>/tmp/onos.out 2>/tmp/onos.err &
+
+    # Setup a symlink to allow other tools to work
+    sudo ln -s /tmp/$ONOS_BITS $ONOS_INSTALL_DIR
+"

@@ -5,3 +5,5 @@ export OC1="10.128.11.1"
 export OC2="10.128.11.2"
 export OC2="10.128.11.2"
 export OC3="10.128.11.3"
 export OC3="10.128.11.3"
 export OCN="10.128.11.4"
 export OCN="10.128.11.4"
+
+export OCT=$OC1

@@ -18,10 +18,11 @@
         <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
         <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
 
 
         <parallel var="${OC#}">
         <parallel var="${OC#}">
+            <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
             <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
             <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
 
 
             <step name="Install-${#}" exec="onos-install ${OC#}"
             <step name="Install-${#}" exec="onos-install ${OC#}"
-                  requires="Uninstall-${#},Push-Bits"/>
+                  requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
 
 
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
             <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
                   requires="Install-${#}"/>
                   requires="Install-${#}"/>

+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="tar-setup" description="ONOS cluster setup via onos.tar.gz">
+    <group name="Setup-Instances">
+        <step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
+
+        <parallel var="${OC#}">
+            <step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}"
+                  unless="${OCT}"/>
+            <step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
+            <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
+
+            <step name="Untar-And-Run-${#}" exec="onos-untar-and-run ${OC#}"
+                  requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
+
+            <step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
+                  requires="Untar-And-Run-${#}"/>
+
+            <step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
+                  requires="~Wait-for-Start-${#}"/>
+            <step name="Check-Components-${#}"
+                  exec="onos-check-components ${OC#}"
+                  requires="~Wait-for-Start-${#}"/>
+            <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
+                  requires="~Wait-for-Start-${#}"/>
+
+            <step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
+                  requires="~Wait-for-Start-${#}"/>
+        </parallel>
+    </group>
+
+    <group name="Setup-Cluster" requires="Setup-Instances" unless="${NO_CLUSTER}">
+        <step name="Form-Cluster" exec="onos-form-cluster cell"/>
+        <parallel var="${OC#}">
+            <step name="Wait-for-Start-Again-${#}"
+                  exec="onos-wait-for-start ${OC#}"
+                  requires="Form-Cluster"/>
+
+            <step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}"
+                  requires="~Wait-for-Start-Again-${#}"/>
+            <step name="Check-Components-Again-${#}"
+                  exec="onos-check-components ${OC#}"
+                  requires="~Wait-for-Start-Again-${#}"/>
+            <step name="Check-Apps-Again-${#}"
+                  exec="onos-check-apps ${OC#} drivers"
+                  requires="~Wait-for-Start-Again-${#}"/>
+
+            <step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
+                  requires="~Wait-for-Start-Again-${#}"/>
+        </parallel>
+    </group>
+
+</scenario>

@@ -106,7 +106,8 @@ public class Compiler {
                                       ImmutableSet.copyOf(dependencies));
                                       ImmutableSet.copyOf(dependencies));
 
 
         // Extract the log directory if there was one specified
         // Extract the log directory if there was one specified
-        String path = scenario.definition().getString(LOG_DIR, DEFAULT_LOG_DIR);
+        String defaultPath = DEFAULT_LOG_DIR + scenario.name();
+        String path = scenario.definition().getString(LOG_DIR, defaultPath);
         logDir = new File(expand(path));
         logDir = new File(expand(path));
     }
     }
 
 

@@ -38,6 +38,7 @@ class ScenarioStore {
 
 
     private final ProcessFlow processFlow;
     private final ProcessFlow processFlow;
     private final File storeFile;
     private final File storeFile;
+    private final File logDir;
 
 
     private final List<StepEvent> events = Lists.newArrayList();
     private final List<StepEvent> events = Lists.newArrayList();
     private final Map<String, Status> statusMap = Maps.newConcurrentMap();
     private final Map<String, Status> statusMap = Maps.newConcurrentMap();
@@ -51,6 +52,7 @@ class ScenarioStore {
      */
      */
     ScenarioStore(ProcessFlow processFlow, File logDir, String name) {
     ScenarioStore(ProcessFlow processFlow, File logDir, String name) {
         this.processFlow = processFlow;
         this.processFlow = processFlow;
+        this.logDir = logDir;
         this.storeFile = new File(logDir, name + ".stc");
         this.storeFile = new File(logDir, name + ".stc");
         load();
         load();
     }
     }
@@ -63,6 +65,7 @@ class ScenarioStore {
         statusMap.clear();
         statusMap.clear();
         processFlow.getVertexes().forEach(step -> statusMap.put(step.name(), WAITING));
         processFlow.getVertexes().forEach(step -> statusMap.put(step.name(), WAITING));
         try {
         try {
+            removeLogs();
             PropertiesConfiguration cfg = new PropertiesConfiguration(storeFile);
             PropertiesConfiguration cfg = new PropertiesConfiguration(storeFile);
             cfg.clear();
             cfg.clear();
             cfg.save();
             cfg.save();
@@ -171,4 +174,18 @@ class ScenarioStore {
         }
         }
     }
     }
 
 
+    /**
+     * Removes all scenario log files.
+     */
+    private void removeLogs() {
+        File[] logFiles = logDir.listFiles();
+        if (logFiles != null && logFiles.length > 0) {
+            for (File file : logFiles) {
+                if (!file.delete()) {
+                    print("Unable to delete log file %s", file);
+                }
+            }
+        }
+    }
+
 }
 }