aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Jagiello <michal.jagiello@t-mobile.pl>2023-09-15 10:30:21 +0200
committerMichal Jagiello <michal.jagiello@t-mobile.pl>2023-09-15 14:58:26 +0200
commit3e8bb0ba2c6f04da8ebd6254ee7f859d5f8ac448 (patch)
tree2a5f0b2184626207b42eaf21a653cbaed2a9cd2e
parent245a4c2fc28b7751f94c168ec94b4b7fb6dd5a6c (diff)
Regression quickfix
Release 12.3.1 quickfix version Issue-ID: INT-2137 Change-Id: I785e7256bc5678e098cdf77d78d9ee27db8fd69f Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
-rw-r--r--src/onapsdk/so/templates/instantiate_service_macro.json.j26
-rw-r--r--src/onapsdk/version.py2
-rw-r--r--tests/test_version.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/onapsdk/so/templates/instantiate_service_macro.json.j2 b/src/onapsdk/so/templates/instantiate_service_macro.json.j2
index d33aea5..a252672 100644
--- a/src/onapsdk/so/templates/instantiate_service_macro.json.j2
+++ b/src/onapsdk/so/templates/instantiate_service_macro.json.j2
@@ -18,7 +18,7 @@
"modelName": "{{ sdc_service.name }}",
"modelVersion": "1.0"
},
- {% if sdc_service.resources and sdc_service.has_vnfs %}
+ {% if sdc_service.components and sdc_service.has_vnfs %}
"cloudConfiguration": {
"tenantId": "{{ tenant.tenant_id }}",
"cloudOwner": "{{ cloud_region.cloud_owner }}",
@@ -44,7 +44,7 @@
{% endif %}
{
"service": {
- {% if not sdc_service.resources %}
+ {% if not sdc_service.components %}
"instanceParams": [],
{% else %}
"instanceParams": [
@@ -59,7 +59,7 @@
],
{% endif %}
"instanceName": "{{ service_instance_name }}",
- {% if not sdc_service.resources %}
+ {% if not sdc_service.components %}
"resources": {},
"modelInfo": {
"modelVersion": "1.0",
diff --git a/src/onapsdk/version.py b/src/onapsdk/version.py
index 4c72004..3aed6ca 100644
--- a/src/onapsdk/version.py
+++ b/src/onapsdk/version.py
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-__version__ = "12.3.0"
+__version__ = "12.3.1"
diff --git a/tests/test_version.py b/tests/test_version.py
index ccf9517..c1cace3 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -17,4 +17,4 @@ import onapsdk.version as version
def test_version():
"""Check version is the right one."""
- assert version.__version__ == '12.3.0'
+ assert version.__version__ == '12.3.1'