Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,8 +1,8 @@
IMGS = imgs/network-public.png imgs/network-private.png imgs/network-community.png \
imgs/confine-partners.png imgs/extend-network.png \
- imgs/testbed.png imgs/testbed-cd-rd.png \
+ imgs/testbed.png imgs/testbed-slice.png imgs/testbed-cd-rd.png \
imgs/testbed-logos-node.png imgs/testbed-logos-mgmt.png imgs/testbed-logos-devel.png
IMGS_BEAMER = imgs/confine,background.pdf
.PHONY: clean
@@ -35,21 +35,24 @@
imgs/extend-network.png: diagrams/extend-network.svg
inkscape -z -C -e $@ -w 1024 $<
imgs/testbed.png: diagrams/testbed-logos.dia
dia -e $@ -L testbed -s 1024x $<
+
+imgs/testbed-slice.png: diagrams/testbed-logos.dia
+ dia -e $@ -L testbed,slice -s 1024x $<
imgs/testbed-cd-rd.png: diagrams/testbed-logos.dia
- dia -e $@ -L testbed,cd-rd -s 1024x $<
+ dia -e $@ -L testbed,slice,cd-rd -s 1024x $<
imgs/testbed-logos-node.png: diagrams/testbed-logos.dia
- dia -e $@ -L testbed,cd-rd,logos-node -s 1024x $<
+ dia -e $@ -L testbed,slice,cd-rd,logos-node -s 1024x $<
imgs/testbed-logos-mgmt.png: diagrams/testbed-logos.dia
- dia -e $@ -L testbed,cd-rd,logos-node,logos-mgmt -s 1024x $<
+ dia -e $@ -L testbed,slice,cd-rd,logos-node,logos-mgmt -s 1024x $<
imgs/testbed-logos-devel.png: diagrams/testbed-logos.dia
- dia -e $@ -L testbed,cd-rd,logos-node,logos-mgmt,logos-devel -s 1024x $<
+ dia -e $@ -L testbed,slice,cd-rd,logos-node,logos-mgmt,logos-devel -s 1024x $<
clean:
rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html
Index: diagrams/testbed-logos.dia
==================================================================
--- diagrams/testbed-logos.dia
+++ diagrams/testbed-logos.dia
@@ -2095,10 +2095,12 @@
+
+
@@ -2127,13 +2129,10 @@
-
-
-
@@ -2163,13 +2162,10 @@
-
-
-
@@ -2199,13 +2195,10 @@
-
-
-
@@ -2585,11 +2578,11 @@
-
+
#L3#
@@ -2648,16 +2641,49 @@
-
+
+
+
+
+
+
+
+
+
+
+ #Sliver def.#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2682,12 +2708,45 @@
+
+
+
+
+
+
+
+
+
+
+ #API#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -2712,11 +2771,11 @@
-
+
@@ -2745,83 +2804,14 @@
-
+
-
-
-
-
-
-
-
-
-
-
- #Sliver def.#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #API#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: script,lightning.txt
==================================================================
--- script,lightning.txt
+++ script,lightning.txt
@@ -61,11 +61,11 @@
** Testbed architecture
- Now, how does the Community-Lab testbed work? *##*
- It consists of a set of nodes (managed by CN members) that follow the
configuration in a set of servers (managed by testbed operators).
- All components in the testbed become reachable via a dedicated management
- network implemented as an IPv6 overlay.
+ network implemented as an IPv6 overlay. *##*
- Then researchers define experiments (the so called slices) in a server.
- And nodes use a REST API to get those definitions from servers and run
several of them simultaneously as VMs (the so called slivers).
- Slivers can access the CN via NAT, natively at the network layer, or in an
isolated VLAN for routing experiments. *##*
Index: slides,lightning.txt
==================================================================
--- slides,lightning.txt
+++ slides,lightning.txt
@@ -111,27 +111,31 @@
- Extend CNs (with Community-Lab nodes and links)
- Community-Lab for hosting services
- [Clommunity](http://clommunity-project.eu/): community clouds
-# Architecture and technologies (1/5)
+# Architecture and technologies (1/6)
![CONFINE testbed architecture](imgs/testbed.png)
-# Architecture and technologies (2/5)
+# Architecture and technologies (2/6)
+
+![CONFINE testbed architecture](imgs/testbed-slice.png)
+
+# Architecture and technologies (3/6)
![CONFINE testbed architecture](imgs/testbed-cd-rd.png)
-# Architecture and technologies (3/5)
+# Architecture and technologies (4/6)
![CONFINE testbed architecture](imgs/testbed-logos-node.png)
-# Architecture and technologies (4/5)
+# Architecture and technologies (5/6)
![CONFINE testbed architecture](imgs/testbed-logos-mgmt.png)
-# Architecture and technologies (5/5)
+# Architecture and technologies (6/6)
![CONFINE testbed architecture](imgs/testbed-logos-devel.png)
# Collaborations