aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INFO.yaml18
-rw-r--r--src/onaptests/configuration/tca-microservice.yaml32
-rw-r--r--src/onaptests/steps/instantiate/service_ala_carte.py4
-rw-r--r--src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zipbin2719 -> 2716 bytes
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm-service.yaml4
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml4
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml4
7 files changed, 44 insertions, 22 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 3bd5e09..dbaab36 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: '2020-05-29'
lifecycle_state: 'Incubation'
project_category: ''
project_lead: &onap_integration_ptl
- name: 'Morgan Richomme'
- email: 'morgan.richomme@orange.com'
- id: 'mrichomme'
- company: 'Orange'
- timezone: 'France/Paris'
+ name: 'Michal Jagiello'
+ email: 'Michal.Jagiello@t-mobile.pl'
+ company: 'T-Mobile'
+ id: 'MichalJagielloTMPL'
+ timezone: 'Europe/Warsaw'
primary_contact: *onap_integration_ptl
issue_tracking:
type: 'jira'
@@ -56,11 +56,6 @@ committers:
company: 'samsung'
id: 'bgrzybowski'
timezone: 'Poland/Warsaw'
- - name: 'Marcin Przybysz'
- email: 'marcin.przybysz@nokia.com'
- company: 'nokia'
- id: 'mprzybys'
- timezone: 'Poland/Warsaw'
- name: 'Krzysztof Kuzmicki'
email: 'krzysztof.kuzmicki@nokia.com'
company: 'nokia'
@@ -120,3 +115,6 @@ tsc:
- type: 'Deletion'
name: 'Thierry Hardy, Lasse Kaihlavirta, Pawel Wieczorek'
link: 'https://lists.onap.org/g/onap-tsc/message/7893'
+ - type: 'Deletion'
+ name: 'Marcin Przybysz'
+ link: 'https://lists.onap.org/g/onap-tsc/message/7893'
diff --git a/src/onaptests/configuration/tca-microservice.yaml b/src/onaptests/configuration/tca-microservice.yaml
index 0f13c53..574dd10 100644
--- a/src/onaptests/configuration/tca-microservice.yaml
+++ b/src/onaptests/configuration/tca-microservice.yaml
@@ -1,6 +1,6 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:k8splugin?version=>=3.4.3,<4.0.0
- - plugin:clamppolicyplugin?version=1.1.0
+ - plugin:clamppolicyplugin?version=1.1.1
inputs:
service_name:
type: string
@@ -37,13 +37,13 @@ inputs:
default: "mongodb://dcae-mongohost/dcae-tcagen2"
tag_version:
type: string
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1"
tca.aai.password:
type: string
default: "DCAE"
tca.aai.url:
type: string
- default: "http://aai.onap.svc.cluster.local"
+ default: "https://aai.onap.svc.cluster.local:8443"
tca.aai.username:
type: string
default: "DCAE"
@@ -62,6 +62,19 @@ inputs:
policy_id:
type: string
default: "onap.restart.tca"
+ cpu_limit:
+ type: string
+ default: "2000m"
+ cpu_request:
+ type: string
+ default: "1000m"
+ memory_limit:
+ type: string
+ default: "2048Mi"
+ memory_request:
+ type: string
+ default: "1024Mi"
+
node_templates:
docker.tca:
type: dcae.nodes.ContainerizedServiceComponent
@@ -123,6 +136,17 @@ node_templates:
type: http
image:
get_input: tag_version
+ resource_config:
+ limits:
+ cpu:
+ get_input: cpu_limit
+ memory:
+ get_input: memory_limit
+ requests:
+ cpu:
+ get_input: cpu_request
+ memory:
+ get_input: memory_request
log_info:
log_directory:
get_input: log_directory
diff --git a/src/onaptests/steps/instantiate/service_ala_carte.py b/src/onaptests/steps/instantiate/service_ala_carte.py
index 8ce2871..4274a9f 100644
--- a/src/onaptests/steps/instantiate/service_ala_carte.py
+++ b/src/onaptests/steps/instantiate/service_ala_carte.py
@@ -70,7 +70,7 @@ class ServiceAlaCarteInstantiateStep(BaseStep):
except ResourceNotFound:
self._logger.info("Owning entity not found, create it")
owning_entity = AaiOwningEntity.create(settings.OWNING_ENTITY)
- vid_project = Project.create(settings.PROJECT)
+ vid_project = Project(settings.PROJECT)
service_instantiation = ServiceInstantiation.instantiate_so_ala_carte(
service,
@@ -197,7 +197,7 @@ class YamlTemplateServiceAlaCarteInstantiateStep(YamlTemplateBaseStep):
except ResourceNotFound:
self._logger.info("Owning entity not found, create it")
owning_entity = AaiOwningEntity.create(settings.OWNING_ENTITY)
- vid_project = Project.create(settings.PROJECT)
+ vid_project = Project(settings.PROJECT)
# Before instantiating, be sure that the service has been distributed
self._logger.info("******** Check Service Distribution *******")
diff --git a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
index bd15d47..bb65587 100644
--- a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
+++ b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
Binary files differ
diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
index 4609bae..227ec48 100644
--- a/src/onaptests/templates/vnf-services/basic_vm-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
@@ -5,7 +5,7 @@ basic_vm:
heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
vnf_parameters: [
{"name": "ubuntu20_image_name",
- "value": "ubuntu-agent"
+ "value": "ubuntu-20.04"
},
{"name": "ubuntu20_key_name",
"value": "cleouverte"
@@ -19,7 +19,7 @@ h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
},
{"name": "ubuntu20_flavor_name",
- "value": "m1.smaller"
+ "value": "m1.small"
},
{"name": "VM_name",
"value": "ubuntu20agent-VM-01"
diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
index a129d41..00f66d5 100644
--- a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
@@ -18,7 +18,7 @@ basic_vm_macro:
- vf_module_name: base_ubuntu20
parameters: [
{"name": "ubuntu20_image_name",
- "value": "Ubuntu_2004"
+ "value": "ubuntu-20.04"
},
{"name": "ubuntu20_key_name",
"value": "cleouverte"
@@ -32,7 +32,7 @@ basic_vm_macro:
t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
},
{"name": "ubuntu20_flavor_name",
- "value": "m1.smaller"
+ "value": "m1.small"
},
{"name": "VM_name",
"value": "ubuntu20agent-VM-01"
diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
index fd56a37..62170bd 100644
--- a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
@@ -18,7 +18,7 @@ basic_vm_macro:
- vf_module_name: base_ubuntu20
parameters: [
{"name": "ubuntu20_image_name",
- "value": "Ubuntu_2004"
+ "value": "ubuntu-20.04"
},
{"name": "ubuntu20_key_name",
"value": "cleouverte"
@@ -32,7 +32,7 @@ basic_vm_macro:
t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
},
{"name": "ubuntu20_flavor_name",
- "value": "m1.smaller"
+ "value": "m1.small"
},
{"name": "VM_name",
"value": "ubuntu20agent-VM-01"