Merge pull request #217 from stevenvanrossem/master

put example topology back in original state

diff --git a/src/emuvim/examples/custom_sap_vnfd.yml b/src/emuvim/examples/custom_sap_vnfd.yml
new file mode 100755 (executable)
index 0000000..2029c4d
--- /dev/null
+++ b/src/emuvim/examples/custom_sap_vnfd.yml
@@ -0,0 +1,50 @@
+
+---
+##
+## Some general information regarding this
+## VNF descriptor.
+##
+descriptor_version: "vnfd-schema-01"
+vendor: "eu.sonata-nfv"
+name: "sap_vnf"
+version: "0.1"
+author: "Steven Van Rossem, Ghent University, steven.vanrossem@intec.ugent.be"
+description: "An empty ubuntu VNF; used as SAP"
+##
+## The virtual deployment unit.
+##
+virtual_deployment_units:
+  - id: "1"
+    vm_image: "sonatanfv/son-emu-sap"
+    vm_image_format: "docker"
+    resource_requirements:
+      cpu:
+        vcpus: 1
+      memory:
+        size: 1
+        size_unit: "GB"
+      storage:
+        size: 1
+        size_unit: "GB"
+    connection_points:
+      - id: "vdu01:cp01"
+        type: "interface"
+
+##
+## The virtual links that interconnect
+## the different connections points.
+##
+virtual_links:
+  - id: "port"
+    connectivity_type: "E-Line"
+    connection_points_reference:
+      - "vdu01:cp02"
+      - "port"
+
+##
+## The VNF connection points to the
+## outside world.
+##
+connection_points:
+  - id: "port"
+    type: "interface"

diff --git a/src/emuvim/examples/demo_topo_1pop.py b/src/emuvim/examples/demo_topo_1pop.py
index 9c851ca..aaee446 100755 (executable)
--- a/src/emuvim/examples/demo_topo_1pop.py
+++ b/src/emuvim/examples/demo_topo_1pop.py
@@ -60,7 +60,7 @@ def create_topology1():
 
 
     # specify a vnfd file to be deployed as internal SAP:
-    sap_vnfd = 'vepc_sap_vnfd.yml'
+    sap_vnfd = 'custom_sap_vnfd.yml'
     dir_path = os.path.dirname(__file__)
     sap_vnfd_path = os.path.join(dir_path, sap_vnfd)
     # sap_vnfd_path = None

diff --git a/src/emuvim/examples/demo_topo_3pop.py b/src/emuvim/examples/demo_topo_3pop.py
index 4dd011c..8020fc8 100755 (executable)
--- a/src/emuvim/examples/demo_topo_3pop.py
+++ b/src/emuvim/examples/demo_topo_3pop.py
@@ -67,7 +67,7 @@ def create_topology1():
 
 
     # specify a vnfd file to be deployed as internal SAP:
-    sap_vnfd = 'vepc_sap_vnfd.yml'
+    sap_vnfd = 'custom_sap_vnfd.yml'
     dir_path = os.path.dirname(__file__)
     sap_vnfd_path = os.path.join(dir_path, sap_vnfd)
     # sap_vnfd_path = None

diff --git a/src/emuvim/examples/sonata_simple_topology.py b/src/emuvim/examples/sonata_simple_topology.py
index bf3cc20..31dd76f 100755 (executable)
--- a/src/emuvim/examples/sonata_simple_topology.py
+++ b/src/emuvim/examples/sonata_simple_topology.py
@@ -47,7 +47,7 @@ logging.basicConfig(level=logging.INFO)
 
 def create_topology1():
     # create topology
-    net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=True)
+    net = DCNetwork(controller=RemoteController, monitor=True, enable_learning=True)
     dc1 = net.addDatacenter("dc1")
 
 
@@ -59,15 +59,8 @@ def create_topology1():
     rapi1.start()
 
 
-    # specify a vnfd file to be deployed as internal SAP:
-    sap_vnfd = 'vepc_sap_vnfd.yml'
-    dir_path = os.path.dirname(__file__)
-    sap_vnfd_path = os.path.join(dir_path, sap_vnfd)
-    # sap_vnfd_path = None
     # add the SONATA dummy gatekeeper to each DC
-    sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000, deploy_sap=True, auto_deploy=True,
-                                          docker_management=True, auto_delete=True,
-                                          sap_vnfd_path=sap_vnfd_path)
+    sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000, deploy_sap=True)
     sdkg1.connectDatacenter(dc1)
     # run the dummy gatekeeper (in another thread, don't block)
     sdkg1.start()

diff --git a/src/emuvim/examples/vepc_sap_vnfd.yml b/src/emuvim/examples/vepc_sap_vnfd.yml
deleted file mode 100755 (executable)
index 4ca0727..0000000
--- a/src/emuvim/examples/vepc_sap_vnfd.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-
----
-##
-## Some general information regarding this
-## VNF descriptor.
-##
-descriptor_version: "vnfd-schema-01"
-vendor: "eu.sonata-nfv"
-name: "sap_vnf"
-version: "0.1"
-author: "Steven Van Rossem, Ghent University, steven.vanrossem@intec.ugent.be"
-description: "A sink for the vEPC service"
-##
-## The virtual deployment unit.
-##
-virtual_deployment_units:
-  - id: "1"
-    vm_image: "sink:v3"
-    vm_image_format: "docker"
-    resource_requirements:
-      cpu:
-        vcpus: 1
-      memory:
-        size: 1
-        size_unit: "GB"
-      storage:
-        size: 1
-        size_unit: "GB"
-    connection_points:
-      - id: "vdu01:cp01"
-        type: "interface"
-
-##
-## The virtual links that interconnect
-## the different connections points.
-##
-virtual_links:
-  - id: "port"
-    connectivity_type: "E-Line"
-    connection_points_reference:
-      - "vdu01:cp01"
-      - "port"
-
-##
-## The VNF connection points to the
-## outside world.
-##
-connection_points:
-  - id: "port"
-    type: "interface"