Merge pull request #122 from lconceicao/descriptor-examples

Updated example descriptors
sonata-nfv · Sep 1, 2017 · 2cbaaf7 · 2cbaaf7
2 parents 208a211 + d25d3a6
commit 2cbaaf7
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 42 deletions.
diff --git a/function-descriptor/examples/firewall-vnfd.yml b/function-descriptor/examples/firewall-vnfd.yml
@@ -61,13 +61,13 @@ virtual_deployment_units:
       - name: "vm_net_tx_MB"
         unit: "Mbps"
     connection_points:
-      - id: "vdu01:eth0"
+      - id: "eth0"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:eth1"
+      - id: "eth1"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:eth2"
+      - id: "eth2"
         interface: "ipv4"
         type: "internal"
 

diff --git a/function-descriptor/examples/iperf-vnfd.yml b/function-descriptor/examples/iperf-vnfd.yml
@@ -33,13 +33,13 @@ virtual_deployment_units:
         size: 10
         size_unit: "GB"
     connection_points:
-      - id: "vdu01:cp01"
+      - id: "cp01"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:cp02"
+      - id: "cp02"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:cp03"
+      - id: "cp03"
         interface: "ipv4"
         type: "internal"
 

diff --git a/function-descriptor/examples/tcpdump-vnfd.yml b/function-descriptor/examples/tcpdump-vnfd.yml
@@ -33,13 +33,13 @@ virtual_deployment_units:
         size: 10
         size_unit: "GB"
     connection_points:
-      - id: "vdu01:cp01"
+      - id: "cp01"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:cp02"
+      - id: "cp02"
         interface: "ipv4"
         type: "internal"
-      - id: "vdu01:cp03"
+      - id: "cp03"
         interface: "ipv4"
         type: "internal"
 

diff --git a/function-descriptor/examples/vtc-vnfd.yml b/function-descriptor/examples/vtc-vnfd.yml
@@ -66,9 +66,9 @@ virtual_deployment_units:
         unit: "Mbps"
     connection_points:
       #Management interface
-      - id: "vdu01:eth0"
-        type: "interface"
-
+      - id: "eth0"
+        interface: "ipv4"
+        type: "internal"
 
   - id: "vdu02"
     vm_image: "TBD"
@@ -94,15 +94,34 @@ virtual_deployment_units:
         unit: "Mbps"
     connection_points:
       #Management interface
-      - id: "vdu02:eth0"
-        type: "interface" #this is the only interface that should get floating IP address. traffic for the other interfaces will be forwarded via the SDN controller" 
-        access: "public" #signal the allocation of public IP from the allocated segment for this tenant. 
+      - id: "eth0"
+        interface: "ipv4" #this is the only interface that should get floating IP address. traffic for the other interfaces will be forwarded via the SDN controller" 
+        type: "internal"
+        #access: "public" #signal the allocation of public IP from the allocated segment for this tenant. 
       #Data-in interface
-      - id: "vdu02:eth1"
-        type: "interface"
+      - id: "eth1"
+        interface: "ipv4"
+        type: "internal"
       #Data-out interfaces
-      - id: "vdu02:eth2"
-        type: "interface"
+      - id: "eth2"
+        interface: "ipv4"
+        type: "internal"
+
+##
+## The VNF connection points to the 
+## outside world.
+##
+connection_points:
+  - id: "mgmt"
+    interface: "ipv4"
+    type: "management"
+  - id: "input"
+    interface: "ipv4"
+    type: "external"
+  - id: "output"
+    interface: "ipv4"
+    type: "external"
+
 ##
 ## The virtual links that interconnect
 ## the different connections points.
@@ -111,6 +130,7 @@ virtual_links:
   - id: "mgmt"
     connectivity_type: "E-LAN"
     connection_points_reference:
+      - "mgmt"
       - "vdu01:eth0"
       - "vdu02:eth0"
     dhcp: True

diff --git a/package-descriptor/examples/sonata-demo-docker.son b/package-descriptor/examples/sonata-demo-docker.son
diff --git a/package-descriptor/examples/sonata-demo.son b/package-descriptor/examples/sonata-demo.son
diff --git a/service-descriptor/examples/sonata-demo-with-ssm.yml b/service-descriptor/examples/sonata-demo-with-ssm.yml
@@ -52,12 +52,15 @@ service_specific_managers:
 ## outside world.
 ##
 connection_points:
-  - id: "ns:mgmt"
-    type: "interface"
-  - id: "ns:input"
-    type: "interface"
-  - id: "ns:output"
-    type: "interface"
+  - id: "mgmt"
+    interface: "ipv4"
+    type: "management"
+  - id: "input"
+    interface: "ipv4"
+    type: "external"
+  - id: "output"
+    interface: "ipv4"
+    type: "external"
 
 ##
 ## The virtual links that interconnect
@@ -70,11 +73,11 @@ virtual_links:
       - "vnf_iperf:mgmt"
       - "vnf_firewall:mgmt"
       - "vnf_tcpdump:mgmt"
-      - "ns:mgmt"
+      - "mgmt"
   - id: "input-2-iperf"
     connectivity_type: "E-Line"
     connection_points_reference:
-      - "ns:input"
+      - "input"
       - "vnf_iperf:input"
   - id: "iperf-2-firewall"
     connectivity_type: "E-Line"
@@ -90,13 +93,13 @@ virtual_links:
     connectivity_type: "E-Line"
     connection_points_reference:
       - "vnf_tcpdump:output"
-      - "ns:output"
+      - "output"
 
 ##
 ## The forwarding graphs.
 ##
 forwarding_graphs:
-  - fg_id: "ns:fg01"
+  - fg_id: "fg01"
     number_of_endpoints: 2
     number_of_virtual_links: 4
     constituent_virtual_links: 
@@ -110,10 +113,10 @@ forwarding_graphs:
       - "vnf_firewall"
       - "vnf_tcpdump"
     network_forwarding_paths:
-      - fp_id: "ns:fg01:fp01"
+      - fp_id: "fg01:fp01"
         policy: "none"
         connection_points:
-          - connection_point_ref: "ns:input"
+          - connection_point_ref: "input"
             position: 1
           - connection_point_ref: "vnf_iperf:input"
             position: 2
@@ -127,6 +130,6 @@ forwarding_graphs:
             position: 6
           - connection_point_ref: "vnf_tcpdump:output"
             position: 7
-          - connection_point_ref: "ns:output"
+          - connection_point_ref: "output"
             position: 8
 
diff --git a/service-descriptor/examples/sonata-demo.yml b/service-descriptor/examples/sonata-demo.yml
@@ -40,13 +40,13 @@ network_functions:
 ## outside world.
 ##
 connection_points:
-  - id: "ns:mgmt"
+  - id: "mgmt"
     interface: "ipv4"
     type: "management"
-  - id: "ns:input"
+  - id: "input"
     interface: "ipv4"
     type: "external"
-  - id: "ns:output"
+  - id: "output"
     interface: "ipv4"
     type: "external"
 
@@ -61,11 +61,11 @@ virtual_links:
       - "vnf_iperf:mgmt"
       - "vnf_firewall:mgmt"
       - "vnf_tcpdump:mgmt"
-      - "ns:mgmt"
+      - "mgmt"
   - id: "input-2-iperf"
     connectivity_type: "E-Line"
     connection_points_reference:
-      - "ns:input"
+      - "input"
       - "vnf_iperf:input"
   - id: "iperf-2-firewall"
     connectivity_type: "E-Line"
@@ -81,13 +81,13 @@ virtual_links:
     connectivity_type: "E-Line"
     connection_points_reference:
       - "vnf_tcpdump:output"
-      - "ns:output"
+      - "output"
 
 ##
 ## The forwarding graphs.
 ##
 forwarding_graphs:
-  - fg_id: "ns:fg01"
+  - fg_id: "fg01"
     number_of_endpoints: 2
     number_of_virtual_links: 4
     constituent_virtual_links: 
@@ -101,10 +101,10 @@ forwarding_graphs:
       - "vnf_firewall"
       - "vnf_tcpdump"
     network_forwarding_paths:
-      - fp_id: "ns:fg01:fp01"
+      - fp_id: "fg01:fp01"
         policy: "none"
         connection_points:
-          - connection_point_ref: "ns:input"
+          - connection_point_ref: "input"
             position: 1
           - connection_point_ref: "vnf_iperf:input"
             position: 2
@@ -118,6 +118,6 @@ forwarding_graphs:
             position: 6
           - connection_point_ref: "vnf_tcpdump:output"
             position: 7
-          - connection_point_ref: "ns:output"
+          - connection_point_ref: "output"
             position: 8