From 6fbc03bc1a8ffcc955e7d88468eb459c6ec534ed Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 30 Mar 2022 10:19:30 +0200 Subject: [PATCH] Minor change --- app/templates/default_form.html | 2 +- app/templates/input_types.html | 8 +------- app/utils.py | 1 - tosca-templates/simple-node-disk.yml | 4 +++- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/templates/default_form.html b/app/templates/default_form.html index 657676ce9..b21c34936 100644 --- a/app/templates/default_form.html +++ b/app/templates/default_form.html @@ -14,7 +14,7 @@ {% set min_length = value.constraints | selectattr('min_length') | map(attribute='min_length') | list %} {% set max_length = value.constraints | selectattr('max_length') | map(attribute='max_length') | list %}
- + {% set constraints = value.constraints | selectattr('valid_values') | map(attribute='valid_values') | list %} diff --git a/app/templates/input_types.html b/app/templates/input_types.html index 2d6ccb26d..0730d864d 100644 --- a/app/templates/input_types.html +++ b/app/templates/input_types.html @@ -1,12 +1,6 @@
{% if value.tag_type is not defined or value.tag_type != "hidden" %} - + {% endif %} {% set min_length = value.constraints | selectattr('min_length') | map(attribute='min_length') | list %} diff --git a/app/utils.py b/app/utils.py index c774ef09e..d88c8fee1 100644 --- a/app/utils.py +++ b/app/utils.py @@ -28,7 +28,6 @@ import ast import time import sys -from radl.radl import outport from radl.radl_json import parse_radl from flask import flash, g from app import appdb diff --git a/tosca-templates/simple-node-disk.yml b/tosca-templates/simple-node-disk.yml index aebcc53fc..478b78b35 100644 --- a/tosca-templates/simple-node-disk.yml +++ b/tosca-templates/simple-node-disk.yml @@ -45,7 +45,9 @@ topology_template: type: map entry_schema: type: PortSpec - description: Comma separated list of ports to be Opened in the Cloud site (eg. 22,80,443) + description: | + Comma separated list of ports to be Opened in the Cloud site (eg. 22,80,443). + You can also include the remote CIDR (eg. 8.8.0.0/24-22,9.9.9.0/24-80,443). default: 22 node_templates: