commit 8b6e17d243375102fb7d79977991a00a6a38ea3d
author Charles Chan <rascov@gmail.com> Thu Feb 14 23:56:54 2019 +0000
committer Charles Chan <charles@opennetworking.org> Tue Mar 05 02:42:36 2019 +0000
tree b10f5d5c23c70311abc71b0bc324a823bf7a76ee
parent d5db8a29e3e2f3c34dfa083c73df3ab833dde4df

Separate double tagged test case from basic Trellis topology

Also add a cleanup script to reset the system

Change-Id: I0a0d70ab412326fad77cb7bb11a6053f64181394

trellis/trellis.json

diff --git a/trellis/trellis.json b/trellis/trellis.json
index cb945ea..e0aa174 100644
--- a/trellis/trellis.json
+++ b/trellis/trellis.json
@@ -19,19 +19,12 @@
         "of:0000000000000204/5" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.2.254/24" ]
-                }
-            ]
-        },
-        "of:0000000000000204/6" : {
-            "interfaces" : [
-                {
                     "ips" : [ "2000::2ff/120" ],
                     "vlan-untagged": 40
                 }
             ]
         },
-        "of:0000000000000204/7" : {
+        "of:0000000000000204/6" : {
             "interfaces" : [
                 {
                     "ips" : [ "2000::2ff/120" ],