X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Ftests%2Ftest_db_descriptors.py;h=6b4be6add1f86c150231aca70851ce5ec7ca70fc;hb=656b6ddc53d7b6640a7b4fad1a7b80241dce9e70;hp=080d88d0c32cb59f20ff58e44eacba5b30641bad;hpb=922c41753ffbb4b526f2135a23c39f480c58e2cb;p=osm%2FLCM.git

diff --git a/osm_lcm/tests/test_db_descriptors.py b/osm_lcm/tests/test_db_descriptors.py
index 080d88d..6b4be6a 100644
--- a/osm_lcm/tests/test_db_descriptors.py
+++ b/osm_lcm/tests/test_db_descriptors.py
@@ -885,9 +885,11 @@ db_vnfds_text = """
 
     virtual-storage-desc:
       - id: mgmt-storage
-        size-of-storage: 10
+        block-storage-data:
+          size-of-storage: 10
       - id: data-storage
-        size-of-storage: 10
+        block-storage-data:
+          size-of-storage: 10
 
     sw-image-desc:
       - id: hackfest3-mgmt
@@ -953,14 +955,12 @@ db_vnfds_text = """
 
     df:
       - id: hackfest_default
-        vnf-configuration-id: vnf-configuration-example
         vdu-profile:
           - id: mgmtVM
             min-number-of-instances: 1
           - id: dataVM
             min-number-of-instances: 1
             max-number-of-instances: 10
-            vdu-configuration-id: vdu-configuration-example
         instantiation-level:
           - id: default
             vdu-level:
@@ -996,32 +996,39 @@ db_vnfds_text = """
                 vnf-config-primitive-name-ref: touch
               - trigger: pre-scale-in
                 vnf-config-primitive-name-ref: touch
+        lcm-operations-configuration:
+          operate-vnf-op-config:
+            day1-2:
+            - id: hackfest3charmed-vnf
+              execution-environment-list:
+                - id: simple-ee
+                  juju:
+                    charm: simple
+              initial-config-primitive:
+                - seq: "1"
+                  execution-environment-ref: simple-ee
+                  name: config
+                  parameter:
+                    - name: ssh-hostname
+                      value: <rw_mgmt_ip>
+                    - name: ssh-username
+                      value: ubuntu
+                    - name: ssh-password
+                      value: osm4u
+                - seq: "2"
+                  execution-environment-ref: simple-ee
+                  name: touch
+                  parameter:
+                    - name: filename
+                      value: <touch_filename>
+              config-primitive:
+                - name: touch
+                  execution-environment-ref: simple-ee
+                  parameter:
+                    - data-type: STRING
+                      default-value: <touch_filename2>
+                      name: filename
 
-    vnf-configuration:
-      - 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: osm4u
-          - seq: "2"
-            name: touch
-            parameter:
-              - name: filename
-                value: <touch_filename>
-        config-primitive:
-          - name: touch
-            parameter:
-              - data-type: STRING
-                default-value: <touch_filename2>
-                name: filename
-        juju:
-          charm: simple
 -   _admin:
         created: 1575031727.5383403
         modified: 1575031727.5383403
@@ -1045,6 +1052,8 @@ db_vnfds_text = """
     -   name: mgmt
     description: KNF with two KDU using helm-charts
     id: multikdu_knf
+    df:
+      - id: "default_df"
     k8s-cluster:
         nets:
         -   external-connection-point-ref: mgmt