Add new example descriptors and update previous ones

[osm/IM.git] / augments / examples / vepc_new.yaml

diff --git a/augments/examples/vepc_new.yaml b/augments/examples/vepc_new.yaml
index c38b9f5..4d1c863 100644 (file)
--- a/augments/examples/vepc_new.yaml
+++ b/augments/examples/vepc_new.yaml
@@ -61,36 +61,24 @@ vnfd:
           - id: spgwmme-mgmt-int
             virtual-network-interface-requirement:
               - name: eth0
-                type: EXTERNAL # Remove (redundant)
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  # ?
           - id: spgwmme-s1-int
             virtual-network-interface-requirement:
               - name: eth1
-                type: EXTERNAL # Remove (redundant)
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  # ?
           - id: spgwmme-sgi-int
             virtual-network-interface-requirement:
               - name: eth2
-                type: EXTERNAL # Remove (redundant)
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  # ?
           - id: spgwmme-s6a-int
             int-virtual-link-desc: s6a # Connection to VLD!
             virtual-network-interface-requirement:
               - id: eth3
-                type: INTERNAL # Remove (redundant)
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  # ?
 
       - id: hss
         name: hss
@@ -103,52 +91,24 @@ vnfd:
           - id: hss-mgmt-int
             virtual-network-interface-requirement:
               - name: eth0
-                type: EXTERNAL
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  # ?
           - id: hss-s6a-int
             int-virtual-link-desc: s6a # Connection to VLD!
             virtual-network-interface-requirement:
               - id: eth1
-                type: INTERNAL
                 virtual-interface:
                   type: PARAVIRT
-                network-interface-requirements:
-                  #?
-        vdu-configuration:
-          initial-config-primitive:
-            - seq: "1"
-              name: config
-              parameter:
-                - name: ssh-hostname
-                  value: <rw_mgmt_ip>
-                - name: ssh-username
-                  value: ubuntu
-                - name: ssh-password
-                  value: <password>
-            - seq: "2"
-              name: configure-hss
-              parameter:
-                - name: spgw-ip
-                  data-type: STRING
-                  value: <spgw_ip>
-                - name: hss-ip
-                  data-type: STRING
-                  value: <hss_ip>
-            - seq: "3"
-              name: restart-hss
-          juju:
-            charm: hsscharm
 
     df:
       - id: vepc_default
+        vnf-configuration-id: vnf-configuration-example
         vdu-profile:
           - id: spgwmme
             min-number-of-instance: 1
           - id: hss
             min-number-of-instance: 1
+            vdu-configuration-id: vdu-configuration-example
         instantiation-level:
           - id: default
             vdu-level:
@@ -184,39 +144,66 @@ vnfd:
               vdu-ref: "spgwmme" # Not included in augments
               vdu-monitoring-param-ref: "spgw_memory_util" # Not included in augments
 
+    vdu-configuration:
+      - id: vdu-configuration-example
+        initial-config-primitive:
+          - seq: "1"
+            name: config
+            parameter:
+              - name: ssh-hostname
+                value: <rw_mgmt_ip>
+              - name: ssh-username
+                value: ubuntu
+              - name: ssh-password
+                value: <password>
+          - seq: "2"
+            name: configure-hss
+            parameter:
+              - name: spgw-ip
+                data-type: STRING
+                value: <spgw_ip>
+              - name: hss-ip
+                data-type: STRING
+                value: <hss_ip>
+          - seq: "3"
+            name: restart-hss
+        juju:
+          charm: hsscharm
+
     vnf-configuration:
-      initial-config-primitive:
-        - seq: "1"
-          name: config
-          parameter:
-            - name: ssh-hostname
-              value: <rw_mgmt_ip>
-            - name: ssh-username
-              value: ubuntu
-            - name: ssh-password
-              value: <password>
-        - seq: "2"
-          name: configure-spgw
-          parameter:
-            - name: spgw-ip
-              data-type: STRING
-              value: <spgw_ip>
-            - name: hss-ip
-              data-type: STRING
-              value: <hss_ip>
-        - seq: "3"
-          name: restart-spgw
-      config-primitive:
-        - name: add-route
-          parameter:
-            - name: external-prefix
-              data-type: STRING
-              default-value: "8.8.8.8/32"
-            - name: next-hop
-              data-type: STRING
-              default-value: "192.168.2.1"
-      juju:
-        charm: spgwcharm
+      - id: vnf-configuration-example
+        initial-config-primitive:
+          - seq: "1"
+            name: config
+            parameter:
+              - name: ssh-hostname
+                value: <rw_mgmt_ip>
+              - name: ssh-username
+                value: ubuntu
+              - name: ssh-password
+                value: <password>
+          - seq: "2"
+            name: configure-spgw
+            parameter:
+              - name: spgw-ip
+                data-type: STRING
+                value: <spgw_ip>
+              - name: hss-ip
+                data-type: STRING
+                value: <hss_ip>
+          - seq: "3"
+            name: restart-spgw
+        config-primitive:
+          - name: add-route
+            parameter:
+              - name: external-prefix
+                data-type: STRING
+                default-value: "8.8.8.8/32"
+              - name: next-hop
+                data-type: STRING
+                default-value: "192.168.2.1"
+        juju:
+          charm: spgwcharm
 
     int-virtual-link-desc:
       - id: s6a