vpp-userdemo: Convert namespaces to full containers.

Changes to convert namespaces to full containers as follows:-

 * c1 -> cone, c2 -> ctwo
 * Containers are accessible via lxc-console and ssh overlinux bridge.
 * vpp is installed and configure in the container.
 * Bridging, routing and tracing demo's work as before.

Change-Id: I4e957600e1e487355e55d2570c430f2ad21cafd6
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/vpp-userdemo/bridging b/vpp-userdemo/bridging
index 1d3c458..83e305a 100644
--- a/vpp-userdemo/bridging
+++ b/vpp-userdemo/bridging
@@ -21,17 +21,17 @@ C2_GW="172.16.1.1"
 INSTR=()
 CMD=()
 INSTR+=("Welcome to the bridging demo. This will show you some simple commands to connect two
-linux netnamespaces to VPP via an L2 bridge.")
+linux containers to VPP via an L2 bridge.")
 CMD+=("")
 
 INSTR+=("To show interfaces type:")
 CMD+=("sudo vppctl show inter")
 
-INSTR+=("Lets examine our workloads c1 and c2")
-CMD+=("sudo ip netns exec c1 ip -o a")
+INSTR+=("Lets examine our workloads cone and ctwo")
+CMD+=("sudo lxc-attach -n cone -- ip -o a")
 
 INSTR+=("")
-CMD+=("sudo ip netns exec c2 ip -o a")
+CMD+=("sudo lxc-attach -n ctwo -- ip -o a")
 
 INSTR+=("To add interfaces, we add the host-side of the veth link pair.")
 CMD+=("ip link")
@@ -49,10 +49,10 @@ INSTR+=("You can also see the bridge-domain")
 CMD+=("sudo vppctl show bridge-domain 1 detail")
 
 INSTR+=("At long last you probably want to see some pings")
-CMD+=("sudo ip netns exec c1 ping -c3 172.16.1.3")
+CMD+=("sudo lxc-attach -n cone -- ping -c3 172.16.1.3")
 
 INSTR+=("")
-CMD+=("sudo ip netns exec c2 ping -c3 172.16.1.2")
+CMD+=("sudo lxc-attach -n ctwo -- ping -c3 172.16.1.2")
 
 INSTR+=("Thanks for doing the bridging demo. To restart this demo and type these commands yourself \nvagrant ssh \nsudo /vagrant/netns.sh \ncat /vagrant/bridging.cmd")
 CMD+=("")