X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_db_descriptors.py;h=19141903f136cb550cc1ff98ab287ce9db16059c;hp=050f70b53d9417fb6172b7f0fbfd07599946b0a3;hb=c9c0339dee11c893b35e9eb05098554dbda751a3;hpb=41a52059cbcadb9bb7baebb38ff9503a362ea8e8 diff --git a/osm_nbi/tests/test_db_descriptors.py b/osm_nbi/tests/test_db_descriptors.py index 050f70b..1914190 100644 --- a/osm_nbi/tests/test_db_descriptors.py +++ b/osm_nbi/tests/test_db_descriptors.py @@ -212,8 +212,13 @@ db_vnfds_text = """ 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 @@ -223,18 +228,18 @@ db_vnfds_text = """ - name: ssh-password value: osm4u - seq: "2" + execution-environment-ref: simple-ee name: touch parameter: - name: filename value: config-primitive: - name: touch + execution-environment-ref: simple-ee parameter: - data-type: STRING default-value: name: filename - juju: - charm: simple """ db_nsds_text = """ @@ -496,10 +501,12 @@ db_vnfrs_text = """ mgmt-vnf: true name: mgmtVM-eth0 ns-vld-id: mgmt + position: 1 - ip-address: 192.168.54.2 mac-address: fa:16:3e:6e:7e:78 name: mgmtVM-eth1 vnf-vld-id: internal + position: 2 internal-connection-point: - connection-point-id: mgmtVM-internal id: mgmtVM-internal @@ -618,3 +625,148 @@ db_vnfrs_text = """ vnfd-id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77 vnfd-ref: hackfest3charmed-vnf """ + +db_vnfm_vnfd_text = """ +--- +- _admin: + created: 1647529096.3635302 + modified: 1650456936.518325 + onboardingState: ONBOARDED + operationalState: ENABLED + projects_read: + - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4 + projects_write: + - 25b5aebf-3da1-49ed-99de-1d2b4a86d6e4 + storage: + descriptor: hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml + folder: 70b47595-fafa-4f63-904b-fc3ada60eebb + fs: mongo + path: /app/storage/ + pkg-dir: hackfest_basic_metrics_vnf + zipfile: package.tar.gz + type: vnfd + usageState: NOT_IN_USE + userDefinedData: {} + _id: 70b47595-fafa-4f63-904b-fc3ada60eebb + _links: + packageContent: + href: /vnfpkgm/v1/vnf_packages/70b47595-fafa-4f63-904b-fc3ada60eebb/package_content + self: + href: /vnfpkgm/v1/vnf_packages/70b47595-fafa-4f63-904b-fc3ada60eebb + vnfd: + href: /vnfpkgm/v1/vnf_packages/70b47595-fafa-4f63-904b-fc3ada60eebb/vnfd + description: A basic VNF descriptor with one VDU and VIM metrics + df: + - id: default-df + instantiation-level: + - id: default-instantiation-level + vdu-level: + - number-of-instances: 1 + vdu-id: hackfest_basic_metrics-VM + scaling-aspect: + - aspect-delta-details: + deltas: + - id: vdu_autoscale-delta + vdu-delta: + - id: hackfest_basic_metrics-VM + number-of-instances: 1 + id: vdu_autoscale + max-scale-level: 1 + name: vdu_autoscale + scaling-policy: + - cooldown-time: 120 + name: cpu_util_above_threshold + scaling-criteria: + - name: cpu_util_above_threshold + scale-in-relational-operation: LT + scale-in-threshold: '10.0000000000' + scale-out-relational-operation: GT + scale-out-threshold: '60.0000000000' + vnf-monitoring-param-ref: vnf_cpu_util + scaling-type: automatic + threshold-time: 10 + vdu-profile: + - id: hackfest_basic_metrics-VM + max-number-of-instances: 2 + min-number-of-instances: 1 + ext-cpd: + - id: vnf-cp0-ext + int-cpd: + cpd: vdu-eth0-int + vdu-id: hackfest_basic_metrics-VM + id: hackfest_basic_metrics-vnf + mgmt-cp: vnf-cp0-ext + onboardingState: ONBOARDED + operationalState: ENABLED + product-name: hackfest_basic_metrics-vnf + sw-image-desc: + - id: bionic + image: bionic + name: bionic + - id: ubuntu18.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + name: ubuntu18.04-aws + vim-type: aws + - id: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest + name: ubuntu18.04-azure + vim-type: azure + - id: ubuntu18.04-gcp + image: ubuntu-os-cloud:image-family:ubuntu-1804-lts + name: ubuntu18.04-gcp + vim-type: gcp + usageState: NOT_IN_USE + vdu: + - alarm: + - actions: + alarm: + - url: https://webhook.site/b79f9bf9-4c19-429d-81ed-19be26a3d5d8 + insufficient-data: + - url: https://webhook.site/b79f9bf9-4c19-429d-81ed-19be26a3d5d8 + ok: + - url: https://webhook.site/b79f9bf9-4c19-429d-81ed-19be26a3d5d8 + alarm-id: alarm-1 + operation: LT + value: '20.0000' + vnf-monitoring-param-ref: vnf_cpu_util + alternative-sw-image-desc: + - ubuntu18.04-aws + - ubuntu18.04-azure + - ubuntu18.04-gcp + cloud-init-file: cloud-config + id: hackfest_basic_metrics-VM + int-cpd: + - id: vdu-eth0-int + virtual-network-interface-requirement: + - name: vdu-eth0 + virtual-interface: + type: PARAVIRT + monitoring-parameter: + - id: vnf_cpu_util + name: vnf_cpu_util + performance-metric: cpu_utilization + - id: vnf_memory_util + name: vnf_memory_util + performance-metric: average_memory_utilization + - id: vnf_packets_sent + name: vnf_packets_sent + performance-metric: packets_sent + - id: vnf_packets_received + name: vnf_packets_received + performance-metric: packets_received + name: hackfest_basic_metrics-VM + sw-image-desc: bionic + virtual-compute-desc: hackfest_basic_metrics-VM-compute + virtual-storage-desc: + - hackfest_basic_metrics-VM-storage + version: '1.0' + virtual-compute-desc: + - id: hackfest_basic_metrics-VM-compute + virtual-cpu: + num-virtual-cpu: 1 + virtual-memory: + size: 1.0 + virtual-storage-desc: + - id: hackfest_basic_metrics-VM-storage + size-of-storage: '10' +"""