Updated topology and script for Internet2 tutorial

Change-Id: Iaeddb03d959d639b30504cb8dbd5e886b9e3a57a
Signed-off-by: Marcel Enguehard <[email protected]>

diff --git a/examples/tutorial/tutorial04-caching.json b/examples/tutorial/tutorial04-caching.json
index 049f0a4..44e53fb 100644 (file)
--- a/examples/tutorial/tutorial04-caching.json
+++ b/examples/tutorial/tutorial04-caching.json
@@ -32,7 +32,7 @@
         {
             "name": "u1srv1",
             "image": "ubuntu1604-cicnsuite-rc2",
-            "category": "meizu",
+            "category": "user",
             "type": "LxcContainer",
             "y": 8,
             "x": 2,
@@ -41,7 +41,7 @@
         {
             "name": "u1srv2",
             "image": "ubuntu1604-cicnsuite-rc2",
-            "category": "meizu",
+            "category": "user",
             "type": "LxcContainer",
             "y": 12,
             "x": 2,
@@ -59,7 +59,7 @@
         {
             "name": "u2srv1",
             "image": "ubuntu1604-cicnsuite-rc2",
-            "category": "meizu",
+            "category": "user",
             "type": "LxcContainer",
             "y": 2,
             "x": 9,
@@ -77,7 +77,7 @@
         {
             "name": "u3srv1",
             "image": "ubuntu1604-cicnsuite-rc2",
-            "category": "meizu",
+            "category": "serverDemo",
             "type": "LxcContainer",
             "y": 10,
             "x": 16,
@@ -86,7 +86,7 @@
         {
             "name": "u3srv2",
             "image": "ubuntu1604-cicnsuite-rc2",
-            "category": "meizu",
+            "category": "serverDemo",
             "type": "LxcContainer",
             "y": 14,
             "x": 16,
@@ -130,7 +130,7 @@
         {
             "type": "WebServer",
             "prefixes": [
-                "/webserver1"
+                "/u3srv1"
             ],
             "node": "u3srv1"
         },
@@ -142,26 +142,26 @@
         {
             "type": "WebServer",
             "prefixes": [
-                "/webserver2"
+                "/u3srv2"
             ],
             "node": "u3srv2"
         },
         {
             "type": "Link",
             "dst_node": "u1srv1",
-            "capacity": 100,
+            "capacity": 200,
             "src_node": "u1core"
         },
         {
             "type": "Link",
             "dst_node": "u1srv2",
-            "capacity": 100,
+            "capacity": 200,
             "src_node": "u1core"
         },
        {
             "type": "Link",
             "dst_node": "u2srv1",
-            "capacity": 100,
+            "capacity": 200,
             "src_node": "u2core"
         },
         {
@@ -178,16 +178,19 @@
         },
         {
             "type": "Link",
+            "capacity": 200,
             "dst_node": "u2core",
             "src_node": "u1core"
         },
         {
             "type": "Link",
+            "capacity": 200,
             "dst_node": "u3core",
             "src_node": "u1core"
         },
         {
             "type": "Link",
+            "capacity": 200,
             "dst_node": "u2core",
             "src_node": "u3core"
         },

diff --git a/scripts/tutorial/tutorial04-iget.sh b/scripts/tutorial/tutorial04-iget.sh
new file mode 100755 (executable)
index 0000000..b7f5486
--- /dev/null
+++ b/scripts/tutorial/tutorial04-iget.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+lxc exec u1srv1 -- bash -c "iget http://u3srv1/$1" &
+lxc exec u1srv2 -- bash -c "iget http://u3srv1/$1" &
+lxc exec u2srv1 -- bash -c "iget http://u3srv1/$1" &
+wait $(jobs -p)