X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Ftests%2Ftest_db_descriptors.py;h=34491a77354fadd5e58e45be47fd0d75e7b6ed92;hb=305b5c4df29e2fe284957ae5f160896b35d34bc9;hp=9decd4e310d7a40c968c094dc5784f90a935a49d;hpb=4369058fc74040102bc7d5d41cd92b579e9027dc;p=osm%2FLCM.git

diff --git a/osm_lcm/tests/test_db_descriptors.py b/osm_lcm/tests/test_db_descriptors.py
index 9decd4e..34491a7 100644
--- a/osm_lcm/tests/test_db_descriptors.py
+++ b/osm_lcm/tests/test_db_descriptors.py
@@ -224,6 +224,66 @@ db_nslcmops_text = """
     operationState: COMPLETED
     startTime: 1575034637.0445576
     statusEnteredTime: 1575034663.8484545
+
+-   _admin:
+      created: 1575034637.044651
+      modified: 1575034637.044651
+      projects_read:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      projects_write:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: 52770491-a765-40ce-97a1-c6e200bba7b3
+    detailed-status: done
+    id: 52770491-a765-40ce-97a1-c6e200bba7b3
+    isAutomaticInvocation: false
+    isCancelPending: false
+    lcmOperationType: instantiate
+    links:
+      nsInstance: /osm/nslcm/v1/ns_instances/c54b14cb-69a8-45bc-b011-d6bea187dc0a
+      self: /osm/nslcm/v1/ns_lcm_op_occs/52770491-a765-40ce-97a1-c6e200bba7b3
+    nsInstanceId: 0bcb701c-ee4d-41ab-8ee6-f4156f7f114d
+    operationParams:
+          lcmOperationType: scale
+          nsInstanceId: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+          scaleVnfData:
+            scaleByStepData:
+              member-vnf-index: native-kdu
+              scaling-group-descriptor: kdu_scaling_group
+            scaleVnfType: SCALE_OUT
+          scaleType: SCALE_VNF
+    operationState: COMPLETED
+    startTime: 1575034637.0445576
+    statusEnteredTime: 1575034663.8484545
+
+-   _admin:
+      created: 1575034637.044651
+      modified: 1575034637.044651
+      projects_read:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      projects_write:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: 4013bbd2-b151-40ee-bcef-7e24ce5432f6
+    detailed-status: done
+    id: 4013bbd2-b151-40ee-bcef-7e24ce5432f6
+    isAutomaticInvocation: false
+    isCancelPending: false
+    lcmOperationType: instantiate
+    links:
+      nsInstance: /osm/nslcm/v1/ns_instances/c54b14cb-69a8-45bc-b011-d6bea187dc0a
+      self: /osm/nslcm/v1/ns_lcm_op_occs/4013bbd2-b151-40ee-bcef-7e24ce5432f6
+    nsInstanceId: 0bcb701c-ee4d-41ab-8ee6-f4156f7f114d
+    operationParams:
+          lcmOperationType: scale
+          nsInstanceId: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+          scaleVnfData:
+            scaleByStepData:
+              member-vnf-index: native-kdu
+              scaling-group-descriptor: kdu_scaling_group_2
+            scaleVnfType: SCALE_OUT
+          scaleType: SCALE_VNF
+    operationState: COMPLETED
+    startTime: 1575034637.0445576
+    statusEnteredTime: 1575034663.8484545
 """
 
 db_nsrs_text = """
@@ -807,6 +867,7 @@ db_nsrs_text = """
     short-name: ALF
     ssh-authorized-key: null
     flavor : [{"vcpu-count":1,"memory-mb":1024,"storage-gb":"10","vim_info":[],"name":"mgmtVM-flv","id":"0"}]
+    affinity-or-anti-affinity-group : []
     image : [ { "image" : "ubuntu16.04", "vim_info" : [ ], "id" : "0" } ]
     vld:
     -   id: mgmt
@@ -893,6 +954,73 @@ db_nsrs_text = """
         vim-network-name: mgmt
     vnfd-id:
     - 7ab0d10d-8ce2-4c68-aef6-cc5a437a9c62
+
+-   _admin:
+      created: 1575034637.011233
+      current-operation: null
+      deployed:
+        K8s:
+        - k8scluster-uuid: 73d96432-d692-40d2-8440-e0c73aee209c
+          kdu-instance: native-kdu-0
+          kdu-model: native-kdu-0
+          kdu-name: native-kdu
+          member-vnf-index: native-kdu
+          vnfr-id: 5ac34899-a23a-4b3c-918a-cd77acadbea6
+        RO:
+          detailed-status: Deployed at VIM
+          nsd_id: b03a8de8-1898-4142-bc6d-3b0787df567d
+          nsr_id: b5ce3e00-8647-415d-afaa-d5a612cf3074
+          nsr_status: ACTIVE
+          operational-status: running
+          vnfd:
+          - id: b9493dae-a4c9-4b96-8965-329581efb0a1
+            member-vnf-index: native-kdu
+        VCA: []
+      modified: 1575034637.011233
+      nsState: INSTANTIATED
+      nslcmop: null
+      operation-type: null
+      projects_read:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      projects_write:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+    additionalParamsForNs: null
+    admin-status: ENABLED
+    config-status: configured
+    constituent-vnfr-ref:
+    - 5ac34899-a23a-4b3c-918a-cd77acadbea6
+    create-time: 1575034636.9990137
+    datacenter: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
+    description: default description
+    detailed-status: done
+    id: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+    instantiate_params:
+      nsDescription: default description
+      nsName: native-kdu
+      nsdId: d0f63683-9032-4c6f-8928-ffd4674b9f69
+      vimAccountId: 74337dcb-ef54-41e7-bd2d-8c0d7fcd326f
+    name: native-kdu
+    name-ref: native-kdu
+    ns-instance-config-ref: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+    nsd-id: d0f63683-9032-4c6f-8928-ffd4674b9f69
+    nsd-name-ref: native-kdu_ns
+    nsd-ref: native-kdu_ns
+    operational-events: []
+    operational-status: init
+    orchestration-progress: {}
+    resource-orchestrator: osmopenmano
+    short-name: native-kdu
+    ssh-authorized-key: null
+    vld:
+    - id: mgmtnet
+      name: null
+      status: ACTIVE
+      status-detailed: null
+      vim-id: 9b6a2ac4-767e-4ec9-9497-8ba63084c77f
+      vim-network-name: mgmt
+    vnfd-id:
+    - d96b1cdf-5ad6-49f7-bf65-907ada989293
 """
 
 ro_ns_text = """
@@ -1511,6 +1639,90 @@ db_vnfds_text = """
     short-name: multikdu_knf
     vendor: Telefonica
     version: '1.0'
+
+-   _admin:
+      created: 1575031727.5383403
+      modified: 1575031727.5383403
+      onboardingState: ONBOARDED
+      operationalState: ENABLED
+      projects_read:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      projects_write:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      storage:
+        descriptor: native-kdu_knf/native-kdu_vnfd.yaml
+        folder: d96b1cdf-5ad6-49f7-bf65-907ada989293
+        fs: local
+        path: /app/storage/
+        pkg-dir: native-kdu_knf
+        zipfile: native-kdu_knf.tar.gz
+      usageState: NOT_IN_USE
+      userDefinedData: {}
+    _id: d96b1cdf-5ad6-49f7-bf65-907ada989293
+    connection-point:
+    - name: mgmt
+    description: KNF with two KDU using juju-bundle
+    df:
+    - id: native-kdu
+      kdu-resource-profile:
+        - id: scale-app
+          kdu-name: native-kdu
+          min-number-of-instances: 1
+          resource-name: app
+        - id: scale-app2
+          kdu-name: native-kdu
+          min-number-of-instances: 1
+          max-number-of-instances: 10
+          resource-name: app2
+      scaling-aspect:
+      - id: kdu_scaling_group
+        name: kdu_scaling_group
+        max-scale-level: 10
+        aspect-delta-details:
+          deltas:
+          - id: native-kdu-delta
+            kdu-resource-delta:
+            - id: scale-app
+              number-of-instances: 1
+      - id: kdu_scaling_group_2
+        name: kdu_scaling_group_2
+        max-scale-level: 10
+        aspect-delta-details:
+          deltas:
+          - id: native-kdu-delta
+            kdu-resource-delta:
+            - id: scale-app
+              number-of-instances: 1
+            - id: scale-app2
+              number-of-instances: 2
+      lcm-operations-configuration:
+        operate-vnf-op-config:
+          day1-2:
+          - id: native-kdu
+            initial-config-primitive:
+            - name: changecontent
+              parameter:
+              - data-type: STRING
+                name: application-name
+                value: nginx
+              - data-type: STRING
+                name: customtitle
+                value: Initial Config Primitive
+              seq: '1'
+    id: native-kdu_knf
+    k8s-cluster:
+      nets:
+      - external-connection-point-ref: mgmt
+        id: mgmtnet
+    kdu:
+    - juju-bundle: stable/native-kdu
+      name: native-kdu
+    mgmt-interface:
+      cp: mgmt
+    name: native-kdu_knf
+    short-name: native-kdu_knf
+    vendor: Ulak Haberlesme A.S.
+    version: '1.0'
 """
 
 db_vnfrs_text = """
@@ -1564,6 +1776,7 @@ db_vnfrs_text = """
         vim-id: c2538499-4c30-41c0-acd5-80cb92f48061
         ns-image-id: 0
         ns-flavor-id: 0
+        affinity-or-anti-affinity-group-id : []
     -   _id: ab453219-2d9a-45c2-864d-2c0788385028
         count-index: 0
         interfaces:
@@ -1587,6 +1800,7 @@ db_vnfrs_text = """
         vim-id: 87973c3f-365d-4227-95c2-7a8abc74349c
         ns-image-id: 0
         ns-flavor-id: 0
+        affinity-or-anti-affinity-group-id : []
     vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
     vld:
     -   id: internal
@@ -1645,6 +1859,7 @@ db_vnfrs_text = """
         vim-id: 248077b2-e3b8-4a37-8b72-575abb8ed912
         ns-image-id: 0
         ns-flavor-id: 0
+        affinity-or-anti-affinity-group-id : []
     -   _id: 889b874d-e1c3-4e75-aa45-53a9b0ddabd9
         count-index: 0
         interfaces:
@@ -1668,6 +1883,7 @@ db_vnfrs_text = """
         vim-id: a4ce4372-e0ad-4ae3-8f9f-1c969f32e77b
         ns-image-id: 0
         ns-flavor-id: 0
+        affinity-or-anti-affinity-group-id : []
     vim-account-id: ea958ba5-4e58-4405-bf42-6e3be15d4c3a
     vld:
     -   id: internal
@@ -1717,6 +1933,42 @@ db_vnfrs_text = """
     vim-account-id: 74337dcb-ef54-41e7-bd2d-8c0d7fcd326f
     vnfd-id: 7ab0d10d-8ce2-4c68-aef6-cc5a437a9c62
     vnfd-ref: multikdu_knf
+
+-   _admin:
+      created: 1575034637.009597
+      modified: 1575034637.009597
+      nsState: NOT_INSTANTIATED
+      projects_read:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+      projects_write:
+      - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4
+    _id: 5ac34899-a23a-4b3c-918a-cd77acadbea6
+    additionalParamsForVnf: null
+    connection-point:
+    - connection-point-id: null
+      id: null
+      name: mgmt
+    created-time: 1575034636.9990137
+    id: 5ac34899-a23a-4b3c-918a-cd77acadbea6
+    ip-address: null
+    k8s-cluster:
+      nets:
+      - external-connection-point-ref: mgmt
+        id: mgmtnet
+        ns-vld-id: mgmtnet
+        vim_net: internal
+    kdur:
+    - ip-address: null
+      juju-bundle: app-bundle
+      k8s-cluster:
+        id: e7169dab-f71a-4f1f-b82b-432605e8c4b3
+      kdu-name: native-kdu
+    member-vnf-index-ref: native-kdu
+    nsr-id-ref: c54b14cb-69a8-45bc-b011-d6bea187dc0a
+    vdur: []
+    vim-account-id: 74337dcb-ef54-41e7-bd2d-8c0d7fcd326f
+    vnfd-id: d96b1cdf-5ad6-49f7-bf65-907ada989293
+    vnfd-ref: native-kdu_knf
 """
 
 db_nslcmops_scale_text = """
@@ -1791,5 +2043,15 @@ test_ids = {
         "ns": "0bcb701c-ee4d-41ab-8ee6-f4156f7f114d",
         "instantiate": "cf3aa178-7640-4174-b921-2330e6f2aad6",
         "terminate": None,
-    }
+    },
+    "TEST-NATIVE-KDU": {
+        "ns": "c54b14cb-69a8-45bc-b011-d6bea187dc0a",
+        "instantiate": "52770491-a765-40ce-97a1-c6e200bba7b3",
+        "terminate": None,
+    },
+    "TEST-NATIVE-KDU-2": {
+        "ns": "c54b14cb-69a8-45bc-b011-d6bea187dc0a",
+        "instantiate": "4013bbd2-b151-40ee-bcef-7e24ce5432f6",
+        "terminate": None,
+    },
 }