diff options
| author |   Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-19 16:20:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-04-19 16:20:59 +0000 |
| commit | ba05bc2b35dd94577e4279fb875d576874b88086 (patch) | |
| tree | d3f4796f6cde111c3955ee25ec98e61cb6767716 | |
| parent | 1564f6e750f5845823129300fcf2d1ca554d5b12 (diff) | |
| parent | bbc0050ae320f21f02c13fece266380556a79b4f (diff) | |
Merge "Updated topology and script for Internet2 tutorial" into vicn/master
| -rw-r--r-- | examples/tutorial/tutorial04-caching.json | 23 | ||||
| -rwxr-xr-x | scripts/tutorial/tutorial04-iget.sh | 5 |
2 files changed, 18 insertions, 10 deletions
diff --git a/examples/tutorial/tutorial04-caching.json b/examples/tutorial/tutorial04-caching.json index 049f0a43..44e53fbf 100644 --- 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 index 00000000..b7f54860 --- /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) |