Fix indentation issues within YAMLs

Fixes applied as reported by yamllint.

Change-Id: I5320d49799ecdd3ffbc8f9fbb8617554a709c247
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/heat/vFWDT/vFWSNK/base_vfw.yaml b/heat/vFWDT/vFWSNK/base_vfw.yaml
index 770f659..bee6ad4 100755 (executable)
--- a/heat/vFWDT/vFWSNK/base_vfw.yaml
+++ b/heat/vFWDT/vFWSNK/base_vfw.yaml
@@ -233,7 +233,7 @@ resources:
       network: { get_param: ext_private_net_id }
       fixed_ips: [{"subnet": { get_param: ext_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_3 }}]
       security_groups:
-       - { get_param: sec_group }
+        - { get_param: sec_group }
 
   vfw_ext_floatingip:
     type: OS::Neutron::FloatingIP

diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
index da06507..fdf1625 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
@@ -82,8 +82,8 @@ resources:
 
   #SDC won't allow too dummy resource as it has to find 'topology_template' TOSCA equivalent in heat templates
   dummy_base:
-      type: OS::Nova::Server
-      properties:
-          name: test
-          image: test
-          flavor: test
+    type: OS::Nova::Server
+    properties:
+      name: test
+      image: test
+      flavor: test

diff --git a/heat/vIPsec/vIPsec/base_vipsec.yaml b/heat/vIPsec/vIPsec/base_vipsec.yaml
index f59bdc1..6815011 100644 (file)
--- a/heat/vIPsec/vIPsec/base_vipsec.yaml
+++ b/heat/vIPsec/vIPsec/base_vipsec.yaml
@@ -741,58 +741,58 @@ resources:
       floating_network_id: { get_param: public_net_id }
       port_id: { get_resource: vpg_private_1_port }
 
-   vpg_0:
-     type: OS::Nova::Server
-     properties:
-       image: { get_param: basic_image_name }
-       flavor: { get_param: packetgen_flavor_name }
-       name: { get_param: vpg_name_0 }
-       key_name: { get_resource: my_keypair }
-       networks:
-         - port: { get_resource: vpg_private_0_port }
-         - port: { get_resource: vpg_private_1_port }
-       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-       user_data_format: RAW
-       user_data:
-         str_replace:
-           params:
-             __ipsec_ipaddr__: { get_param: vipsec_A_private_ip_0 }
-             __protected_clientB_net_cidr__: { get_param: protected_clientB_private_net_cidr }
-             __sink_ipaddr__: { get_param: vsn_private_ip_0 }
-             __demo_artifacts_version__: { get_param: demo_artifacts_version }
-             __install_script_version__: { get_param: install_script_version }
-             __vpg_private_ip_0__: { get_param: vpg_private_ip_0 }
-             __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
-             __protected_clientA_net_cidr__: { get_param: protected_clientA_private_net_cidr }
-             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
-             __cloud_env__: { get_param: cloud_env }
-             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-           template: |
-             #!/bin/bash
-
-             # Create configuration files
-             mkdir /opt/config
-             echo "__ipsec_ipaddr__" > /opt/config/vipsec_ipaddr.txt
-             echo "__protected_clientB_net_cidr__" > /opt/config/protected_clientB_net_cidr.txt
-             echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt
-             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-             echo "__install_script_version__" > /opt/config/install_script_version.txt
-             echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt
-             echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt
-             echo "__protected_clientA__net_cidr__" > /opt/config/protected_clientA_net_cidr.txt
-             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
-             echo "__cloud_env__" > /opt/config/cloud_env.txt
-             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-
-             # Download and run install script
-             apt-get update
-             apt-get -y install unzip
-             if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-             curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vipsec&a=vipsec-scripts&e=zip&v=__install_script_version__" -o /opt/vipsec-scripts-__install_script_version__.zip
-             unzip -j /opt/vipsec-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
-             cd /opt
-             chmod +x v_packetgen_install.sh
-             ./v_packetgen_install.sh
+  vpg_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: basic_image_name }
+      flavor: { get_param: packetgen_flavor_name }
+      name: { get_param: vpg_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - port: { get_resource: vpg_private_0_port }
+        - port: { get_resource: vpg_private_1_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __ipsec_ipaddr__: { get_param: vipsec_A_private_ip_0 }
+            __protected_clientB_net_cidr__: { get_param: protected_clientB_private_net_cidr }
+            __sink_ipaddr__: { get_param: vsn_private_ip_0 }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
+            __install_script_version__: { get_param: install_script_version }
+            __vpg_private_ip_0__: { get_param: vpg_private_ip_0 }
+            __vpg_private_ip_1__: { get_param: vpg_private_ip_1 }
+            __protected_clientA_net_cidr__: { get_param: protected_clientA_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
+            __cloud_env__: { get_param: cloud_env }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__ipsec_ipaddr__" > /opt/config/vipsec_ipaddr.txt
+            echo "__protected_clientB_net_cidr__" > /opt/config/protected_clientB_net_cidr.txt
+            echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt
+            echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt
+            echo "__protected_clientA__net_cidr__" > /opt/config/protected_clientA_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+
+            # Download and run install script
+            apt-get update
+            apt-get -y install unzip
+            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vipsec&a=vipsec-scripts&e=zip&v=__install_script_version__" -o /opt/vipsec-scripts-__install_script_version__.zip
+            unzip -j /opt/vipsec-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
+            cd /opt
+            chmod +x v_packetgen_install.sh
+            ./v_packetgen_install.sh
 
 
   # Virtual Sink instantiation
@@ -820,51 +820,51 @@ resources:
       floating_network_id: { get_param: public_net_id }
       port_id: { get_resource: vsn_private_1_port }
 
-   vsn_0:
-     type: OS::Nova::Server
-     properties:
-       image: { get_param: basic_image_name }
-       flavor: { get_param: sink_flavor_name }
-       name: { get_param: vsn_name_0 }
-       key_name: { get_resource: my_keypair }
-       networks:
-         - port: { get_resource: vsn_private_0_port }
-         - port: { get_resource: vsn_private_1_port }
-       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-       user_data_format: RAW
-       user_data:
-         str_replace:
-           params:
-             __protected_net_gw__: { get_param: vipsec_B_private_ip_0 }
-             __protected_net_A__: { get_param: protected_clientA_private_net_cidr }
-             __install_script_version__: { get_param: install_script_version }
-             __vsn_private_ip_0__: { get_param: vsn_private_ip_0 }
-             __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
-             __protected_clientB_private_net_cidr__: { get_param: protected_clientB_private_net_cidr }
-             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
-             __cloud_env__: { get_param: cloud_env }
-             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-           template: |
-             #!/bin/bash
-
-             # Create configuration files
-             mkdir /opt/config
-             echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
-             echo "__protected_net_A__" > /opt/config/protected_net_A.txt
-             echo "__install_script_version__" > /opt/config/install_script_version.txt
-             echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
-             echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
-             echo "__protected_clientB_private_net_cidr__" > /opt/config/protected_clientB_private_net_cidr.txt
-             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
-             echo "__cloud_env__" > /opt/config/cloud_env.txt
-             echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-
-             # Download and run install script
-             apt-get update
-             apt-get -y install unzip
-             if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-             curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vipsec&a=vipsec-scripts&e=zip&v=__install_script_version__" -o /opt/vipsec-scripts-__install_script_version__.zip
-             unzip -j /opt/vipsec-scripts-__install_script_version__.zip -d /opt v_sink_install.sh
-             cd /opt
-             chmod +x v_sink_install.sh
-             ./v_sink_install.sh
+  vsn_0:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: basic_image_name }
+      flavor: { get_param: sink_flavor_name }
+      name: { get_param: vsn_name_0 }
+      key_name: { get_resource: my_keypair }
+      networks:
+        - port: { get_resource: vsn_private_0_port }
+        - port: { get_resource: vsn_private_1_port }
+      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __protected_net_gw__: { get_param: vipsec_B_private_ip_0 }
+            __protected_net_A__: { get_param: protected_clientA_private_net_cidr }
+            __install_script_version__: { get_param: install_script_version }
+            __vsn_private_ip_0__: { get_param: vsn_private_ip_0 }
+            __vsn_private_ip_1__: { get_param: vsn_private_ip_1 }
+            __protected_clientB_private_net_cidr__: { get_param: protected_clientB_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
+            __cloud_env__: { get_param: cloud_env }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir /opt/config
+            echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
+            echo "__protected_net_A__" > /opt/config/protected_net_A.txt
+            echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt
+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt
+            echo "__protected_clientB_private_net_cidr__" > /opt/config/protected_clientB_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+
+            # Download and run install script
+            apt-get update
+            apt-get -y install unzip
+            if [[ "__install_script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vipsec&a=vipsec-scripts&e=zip&v=__install_script_version__" -o /opt/vipsec-scripts-__install_script_version__.zip
+            unzip -j /opt/vipsec-scripts-__install_script_version__.zip -d /opt v_sink_install.sh
+            cd /opt
+            chmod +x v_sink_install.sh
+            ./v_sink_install.sh

diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml
index 32c711b..5b3b0fb 100644 (file)
--- a/heat/vLB/dnsscaling.yaml
+++ b/heat/vLB/dnsscaling.yaml
@@ -153,7 +153,7 @@ resources:
       network: { get_param: vlb_private_net_id }
       fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
       security_groups:
-       - { get_param: sec_group }
+        - { get_param: sec_group }
 
   vdns_2_private_1_port:
     type: OS::Neutron::Port
@@ -161,7 +161,7 @@ resources:
       network: { get_param: onap_private_net_id }
       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
       security_groups:
-       - { get_param: sec_group }
+        - { get_param: sec_group }
 
   vdns_2:
     type: OS::Nova::Server

diff --git a/heat/vLB_HPA/dnsscaling.yaml b/heat/vLB_HPA/dnsscaling.yaml
index 32c711b..5b3b0fb 100644 (file)
--- a/heat/vLB_HPA/dnsscaling.yaml
+++ b/heat/vLB_HPA/dnsscaling.yaml
@@ -153,7 +153,7 @@ resources:
       network: { get_param: vlb_private_net_id }
       fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
       security_groups:
-       - { get_param: sec_group }
+        - { get_param: sec_group }
 
   vdns_2_private_1_port:
     type: OS::Neutron::Port
@@ -161,7 +161,7 @@ resources:
       network: { get_param: onap_private_net_id }
       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
       security_groups:
-       - { get_param: sec_group }
+        - { get_param: sec_group }
 
   vdns_2:
     type: OS::Nova::Server

diff --git a/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
index c0ca061..63e8b2e 100644 (file)
--- a/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+++ b/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
@@ -264,19 +264,19 @@ data_types:
     description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour
     properties:
       associated_layer_protocol:
-         type: string
-         description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
-         required: true
-         constraints:
-           - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+        type: string
+        description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
+        required: true
+        constraints:
+          - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
       l2_protocol_data:
-         type: tosca.datatypes.nfv.L2ProtocolData
-         description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L2ProtocolData
+        description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
+        required: false
       l3_protocol_data:
-         type: tosca.datatypes.nfv.L3ProtocolData
-         description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L3ProtocolData
+        description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
+        required: false
 
   tosca.datatypes.nfv.L2ProtocolData:
     derived_from: tosca.datatypes.Root
@@ -548,7 +548,7 @@ data_types:
         description: Specifies the maximum packet loss ratio
         required: false
         constraints:
-           - in_range: [ 0.0, 1.0 ]
+          - in_range: [ 0.0, 1.0 ]
 
   tosca.datatypes.nfv.VnfConfigurableProperties:
     derived_from: tosca.datatypes.Root
@@ -702,26 +702,26 @@ data_types:
         default: false
 
   tosca.datatypes.nfv.VirtualObjectStorageData:
-      derived_from: tosca.datatypes.Root
-      description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
-      properties:
-        max_size_of_storage:
-          type: scalar-unit.size
-          description: Maximum size of virtualized storage resource
-          required: false
+    derived_from: tosca.datatypes.Root
+    description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
+    properties:
+      max_size_of_storage:
+        type: scalar-unit.size
+        description: Maximum size of virtualized storage resource
+        required: false
 
   tosca.datatypes.nfv.VirtualFileStorageData:
-      derived_from: tosca.datatypes.Root
-      description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
-      properties:
-        size_of_storage:
-          type: scalar-unit.size
-          description: Size of virtualized storage resource
-          required: true
-        file_system_protocol:
-          type: string
-          description: The shared file system protocol (e.g. NFS, CIFS)
-          required: true
+    derived_from: tosca.datatypes.Root
+    description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
+    properties:
+      size_of_storage:
+        type: scalar-unit.size
+        description: Size of virtualized storage resource
+        required: true
+      file_system_protocol:
+        type: string
+        description: The shared file system protocol (e.g. NFS, CIFS)
+        required: true
 
   tosca.datatypes.nfv.VirtualLinkBitrateLevel:
     derived_from: tosca.datatypes.Root
@@ -802,7 +802,7 @@ data_types:
         description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply.
         required: true
         constraints:
-           - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
+          - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
       collection_period:
         type: scalar-unit.time
         description: Describes the recommended periodicity at which to collect the performance information.
@@ -917,18 +917,18 @@ capability_types:
         description: Describes the Logical Node requirements
         required: false
         entry_schema:
-           type: tosca.datatypes.nfv.LogicalNodeData
+          type: tosca.datatypes.nfv.LogicalNodeData
       requested_additional_capabilities:
         type: map
         description: Describes additional capability for a particular VDU
         required: false
         entry_schema:
-           type: tosca.datatypes.nfv.RequestedAdditionalCapability
+          type: tosca.datatypes.nfv.RequestedAdditionalCapability
       compute_requirements:
         type: map
         required: false
         entry_schema:
-           type: string
+          type: string
       virtual_memory:
         type: tosca.datatypes.nfv.VirtualMemory
         description: Describes virtual memory of the virtualized compute
@@ -1297,10 +1297,10 @@ node_types:
         type: tosca.capabilities.nfv.VirtualStorage
         description: Defines the capabilities of virtual_storage.
     requirements:
-     - virtual_link:
-         capability: tosca.capabilities.nfv.VirtualLinkable
-         relationship: tosca.relationships.nfv.VirtualLinksTo
-         #description: Describes the requirements for linking to virtual link
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          #description: Describes the requirements for linking to virtual link
 
   tosca.nodes.nfv.Cp:
     derived_from: tosca.nodes.Root

diff --git a/tosca/vCPE/Definitions/onap_dm.yaml b/tosca/vCPE/Definitions/onap_dm.yaml
index c2e9395..c047df8 100644 (file)
--- a/tosca/vCPE/Definitions/onap_dm.yaml
+++ b/tosca/vCPE/Definitions/onap_dm.yaml
@@ -526,19 +526,19 @@ data_types:
     description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour
     properties:
       associated_layer_protocol:
-         type: string
-         description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
-         required: true
-         constraints:
-           - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+        type: string
+        description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
+        required: true
+        constraints:
+          - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
       l2_protocol_data:
-         type: tosca.datatypes.nfv.L2ProtocolData
-         description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L2ProtocolData
+        description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
+        required: false
       l3_protocol_data:
-         type: tosca.datatypes.nfv.L3ProtocolData
-         description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L3ProtocolData
+        description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
+        required: false
 
   tosca.datatypes.nfv.VlProfile:
     derived_from: tosca.datatypes.Root
@@ -767,7 +767,7 @@ data_types:
         description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply.
         required: true
         constraints:
-           - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
+          - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
       collection_period:
         type: scalar-unit.time
         description: Describes the recommended periodicity at which to collect the performance information.
@@ -1256,10 +1256,10 @@ node_types:
         type: tosca.capabilities.nfv.VirtualStorage
         description: Defines the capabilities of virtual_storage.
     requirements:
-     - virtual_link:
-         capability: tosca.capabilities.nfv.VirtualLinkable
-         relationship: tosca.relationships.nfv.VirtualLinksTo
-         #description: Describes the requirements for linking to virtual link
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          #description: Describes the requirements for linking to virtual link
   tosca.nodes.nfv.Vdu.VirtualObjectStorage:
     derived_from: tosca.nodes.Root
     description: This node type describes the specifications of requirements related to virtual object storage resources
@@ -1347,38 +1347,38 @@ node_types:
           relationship: tosca.relationships.nfv.VirtualBindsTo
           node: tosca.nodes.nfv.Vdu.Compute
   tosca.nodes.nfv.VnfVirtualLink:
-      derived_from: tosca.nodes.Root
-      description: Describes the information about an internal VNF VL
-      properties:
-        connectivity_type:
-          type: tosca.datatypes.nfv.ConnectivityType
-          description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL
-          required: true
-        description:
+    derived_from: tosca.nodes.Root
+    description: Describes the information about an internal VNF VL
+    properties:
+      connectivity_type:
+        type: tosca.datatypes.nfv.ConnectivityType
+        description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL
+        required: true
+      description:
+        type: string
+        description: Provides human-readable information on the purpose of the VL
+        required: false
+      test_access:
+        type: list
+        description: Test access facilities available on the VL
+        required: false
+        entry_schema:
           type: string
-          description: Provides human-readable information on the purpose of the VL
-          required: false
-        test_access:
-          type: list
-          description: Test access facilities available on the VL
-          required: false
-          entry_schema:
-            type: string
-            constraints:
-              - valid_values: [ passive_monitoring, active_loopback ]
-        vl_profile:
-          type: tosca.datatypes.nfv.VlProfile
-          description: Defines additional data for the VL
-          required: true
-        monitoring_parameters:
-          type: list
-          description: Describes monitoring parameters applicable to the VL
-          required: false
-          entry_schema:
-            type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter
-      capabilities:
-        virtual_linkable:
-          type: tosca.capabilities.nfv.VirtualLinkable
+          constraints:
+            - valid_values: [ passive_monitoring, active_loopback ]
+      vl_profile:
+        type: tosca.datatypes.nfv.VlProfile
+        description: Defines additional data for the VL
+        required: true
+      monitoring_parameters:
+        type: list
+        description: Describes monitoring parameters applicable to the VL
+        required: false
+        entry_schema:
+          type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter
+    capabilities:
+      virtual_linkable:
+        type: tosca.capabilities.nfv.VirtualLinkable
   tosca.nodes.nfv.VNF:
     derived_from: tosca.nodes.Root
     description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD

diff --git a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
index de9eaeb..6555e92 100644 (file)
--- a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
+++ b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
@@ -205,25 +205,25 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", { get_input: dcae_collector_ip}, " > /opt/config/dcae_collector_ip.txt\n",
-                              "echo ", { get_input: dcae_collector_port}, " > /opt/config/dcae_collector_port.txt\n",
-                              "echo ", { get_input: vaaa_private_ip_0}, " > /opt/config/cpe_signal_net_ipaddr.txt\n",
-                              "echo ", { get_input: vaaa_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", { get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", { get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
-                              "echo ", { get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", { get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", { get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", { get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", { get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_aaa_install.sh -o /opt/v_aaa_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_aaa_install.sh\n",
-                              "./v_aaa_install.sh\n"
-                            ]
-                   }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", { get_input: dcae_collector_ip}, " > /opt/config/dcae_collector_ip.txt\n",
+            "echo ", { get_input: dcae_collector_port}, " > /opt/config/dcae_collector_port.txt\n",
+            "echo ", { get_input: vaaa_private_ip_0}, " > /opt/config/cpe_signal_net_ipaddr.txt\n",
+            "echo ", { get_input: vaaa_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", { get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", { get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
+            "echo ", { get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", { get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", { get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", { get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", { get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_aaa_install.sh -o /opt/v_aaa_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_aaa_install.sh\n",
+            "./v_aaa_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vaaa_private_0_port
@@ -257,23 +257,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", {get_input: vdns_private_ip_0}, " > /opt/config/cpe_public_net_ipaddr.txt\n",
-                              "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
-                              "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dns_install.sh -o /opt/v_dns_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_dns_install.sh\n",
-                              "./v_dns_install.sh\n"
-                            ]
-                   }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vdns_private_ip_0}, " > /opt/config/cpe_public_net_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dns_install.sh -o /opt/v_dns_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_dns_install.sh\n",
+            "./v_dns_install.sh\n"
+          ]
+          }
       requirements:
         - port: vdns_private_0_port
         - port: vdns_private_1_port
@@ -307,23 +307,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", {get_input: vdhcp_private_ip_0}, " > /opt/config/cpe_signal_ipaddr.txt\n",
-                              "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", {get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
-                              "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_dhcp_install.sh\n",
-                              "./v_dhcp_install.sh\n"
-                            ]
-                    }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vdhcp_private_ip_0}, " > /opt/config/cpe_signal_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_dhcp_install.sh\n",
+            "./v_dhcp_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vdhcp_private_0_port
@@ -359,23 +359,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                               "#!/bin/bash\n",
-                               "mkdir /opt/config\n",
-                               "echo ", {get_input: vweb_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                               "echo ", {get_input: vweb_private_ip_0}, " > /opt/config/cpe_public_ipaddr.txt\n",
-                               "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                               "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
-                               "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                               "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                               "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                               "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                               "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                               "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_web_install.sh -o /opt/v_web_install.sh\n",
-                               "cd /opt\n",
-                               "chmod +x v_web_install.sh\n",
-                               "./v_web_install.sh\n"
-                            ]
-                  }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vweb_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vweb_private_ip_0}, " > /opt/config/cpe_public_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_web_install.sh -o /opt/v_web_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_web_install.sh\n",
+            "./v_web_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vweb_private_0_port

diff --git a/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetraffic/site.yml b/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetraffic/site.yml
index 14de164..90b3497 100644 (file)
--- a/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetraffic/site.yml
+++ b/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetraffic/site.yml
@@ -40,43 +40,43 @@
       set_fact:
         vserver2_interfaces: "{{destinations[0].vservers[1]['l-interfaces'] | list}}"
     - block:
-       - name: length interfaces vserver1
-         set_fact:
-           length1: "{{ vserver1_interfaces |length }}"
-       - name: length interfaces vserver2
-         set_fact:
-           length2: "{{ vserver2_interfaces |length }}"
+        - name: length interfaces vserver1
+          set_fact:
+            length1: "{{ vserver1_interfaces |length }}"
+        - name: length interfaces vserver2
+          set_fact:
+            length2: "{{ vserver2_interfaces |length }}"
     - block:
-       - name: adress 1 vserver
-         set_fact:
-           sink_addresses:
-             - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-       - name: adress 2 vserver
-         set_fact:
-           fw_addresses:
-             - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[1]['l-interfaces'][3]['ipv4-addresses'][0]}}"
+        - name: adress 1 vserver
+          set_fact:
+            sink_addresses:
+              - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+        - name: adress 2 vserver
+          set_fact:
+            fw_addresses:
+              - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[1]['l-interfaces'][3]['ipv4-addresses'][0]}}"
       when:
         - length1 == "3"
         - length2 == "4"
     - block:
-       - name: adress 1 vserver
-         set_fact:
-           fw_addresses:
-             - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[0]['l-interfaces'][3]['ipv4-addresses'][0]}}"
-       - name: adress 2 vserver
-         set_fact:
-           sink_addresses:
-             - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-             - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+        - name: adress 1 vserver
+          set_fact:
+            fw_addresses:
+              - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[0]['l-interfaces'][3]['ipv4-addresses'][0]}}"
+        - name: adress 2 vserver
+          set_fact:
+            sink_addresses:
+              - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+              - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
       when:
         - length1 == "4"
         - length2 == "3"
@@ -122,12 +122,12 @@
     - debug: var=fwIp
     - debug: var=sinkIp
     - block:
-       - name: get new FW IP
-         set_fact:
-           fwIp: "{{fwIp.stdout}}"
-       - name: get new SINK IP
-         set_fact:
-           sinkIp: "{{sinkIp.stdout}}"
+        - name: get new FW IP
+          set_fact:
+            fwIp: "{{fwIp.stdout}}"
+        - name: get new SINK IP
+          set_fact:
+            sinkIp: "{{sinkIp.stdout}}"
     - debug: var=pkgIp.stdout
     - debug: var=oldFwIp.stdout
     - debug: var=oldSinkIp.stdout

diff --git a/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetrafficcheck/site.yml b/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetrafficcheck/site.yml
index 665619a..36e3624 100644 (file)
--- a/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetrafficcheck/site.yml
+++ b/tutorials/vFWDT/playbooks/vpgn/latest/ansible/distributetrafficcheck/site.yml
@@ -28,43 +28,43 @@
     set_fact:
       vserver2_interfaces: "{{destinations[0].vservers[1]['l-interfaces'] | list}}"
   - block:
-     - name: length interfaces vserver1
-       set_fact:
-         length1: "{{ vserver1_interfaces |length }}"
-     - name: length interfaces vserver2
-       set_fact:
-         length2: "{{ vserver2_interfaces |length }}"
+      - name: length interfaces vserver1
+        set_fact:
+          length1: "{{ vserver1_interfaces |length }}"
+      - name: length interfaces vserver2
+        set_fact:
+          length2: "{{ vserver2_interfaces |length }}"
   - block:
-     - name: adress 1 vserver
-       set_fact:
-         sink_addresses:
-           - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-     - name: adress 2 vserver
-       set_fact:
-         fw_addresses:
-           - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[1]['l-interfaces'][3]['ipv4-addresses'][0]}}"
+      - name: adress 1 vserver
+        set_fact:
+          sink_addresses:
+            - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+      - name: adress 2 vserver
+        set_fact:
+          fw_addresses:
+            - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[1]['l-interfaces'][3]['ipv4-addresses'][0]}}"
     when:
       - length1 == "3"
       - length2 == "4"
   - block:
-     - name: adress 1 vserver
-       set_fact:
-         fw_addresses:
-           - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[0]['l-interfaces'][3]['ipv4-addresses'][0]}}"
-     - name: adress 2 vserver
-       set_fact:
-         sink_addresses:
-           - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
-           - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+      - name: adress 1 vserver
+        set_fact:
+          fw_addresses:
+            - "{{destinations[0].vservers[0]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[0]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[0]['l-interfaces'][2]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[0]['l-interfaces'][3]['ipv4-addresses'][0]}}"
+      - name: adress 2 vserver
+        set_fact:
+          sink_addresses:
+            - "{{destinations[0].vservers[1]['l-interfaces'][0]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[1]['l-interfaces'][1]['ipv4-addresses'][0]}}"
+            - "{{destinations[0].vservers[1]['l-interfaces'][2]['ipv4-addresses'][0]}}"
     when:
       - length1 == "4"
       - length2 == "3"

diff --git a/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml
index e28ac31..3b0da01 100644 (file)
--- a/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml
+++ b/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml
@@ -19,7 +19,7 @@ node_types:
                     type: string
                     consraints:
                     - valid_values:
-                        - zone
+                          - zone
             identity:
                 type: string
                 required: true
@@ -30,8 +30,8 @@ node_types:
                     type: string
                     constraints:
                     - valid_values:
-                        - any
-                        - all
+                          - any
+                          - all
             affinityProperties:
                 type: policy.data.affinityProperties_properties
                 required: true
@@ -51,8 +51,8 @@ data_types:
                     type: string
                     constraints:
                     - valid_values:
-                        - same
-                        - different
+                          - same
+                          - different
             category:
                 type: string
                 required: true

diff --git a/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml
index 6fb6c8c..0638fb4 100644 (file)
--- a/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml
+++ b/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml
@@ -19,7 +19,7 @@ node_types:
                     type: string
                     consraints:
                     - valid_values:
-                        - request_param_query
+                          - request_param_query
             identity:
                 type: string
                 required: true

diff --git a/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml
index 5a4dfd9..f4e9849 100644 (file)
--- a/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml
+++ b/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml
@@ -19,7 +19,7 @@ node_types:
                     type: string
                     consraints:
                     - valid_values:
-                        - vnfPolicy
+                          - vnfPolicy
             identity:
                 type: string
                 required: true
@@ -35,8 +35,8 @@ node_types:
                     type: string
                     constraints:
                     - valid_values:
-                        - any
-                        - all
+                          - any
+                          - all
             vnfProperties:
                 type: list
                 required: true
@@ -59,10 +59,10 @@ data_types:
                     type: string
                     constraints:
                     - valid_values:
-                        - serviceInstanceId
-                        - vnfName
-                        - cloudRegionId
-                        - vimId
+                          - serviceInstanceId
+                          - vnfName
+                          - cloudRegionId
+                          - vimId
             customerId:
                 type: string
                 required: true

diff --git a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml
index 4e03eb7..a09bbde 100644 (file)
--- a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml
+++ b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml
@@ -21,18 +21,18 @@ spec:
   mtls: true
   autoInjectionNamespaces:
   -
-  sds:
-    enabled: true
-    udsPath: "unix:/var/run/sds/uds_path"
-    useTrustworthyJwt: false
-    useNormalJwt: true
-  gateways:
-    enabled: true
-    ingress:
+    sds:
       enabled: true
-      sds:
+      udsPath: "unix:/var/run/sds/uds_path"
+      useTrustworthyJwt: false
+      useNormalJwt: true
+    gateways:
+      enabled: true
+      ingress:
         enabled: true
-        image: "docker.io/istio/node-agent-k8s:1.2.2"
-  nodeAgent:
-    enabled: true
-    image: "docker.io/istio/node-agent-k8s:1.2.2"
+        sds:
+          enabled: true
+          image: "docker.io/istio/node-agent-k8s:1.2.2"
+    nodeAgent:
+      enabled: true
+      image: "docker.io/istio/node-agent-k8s:1.2.2"

diff --git a/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml b/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml
index a27bbcf..e8cda21 100644 (file)
--- a/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml
+++ b/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml
@@ -17,9 +17,9 @@ metadata:
   name: keycloak
   namespace: keycloak
 image:
-    repository: jboss/keycloak
-    tag: 6.0.1
-    pullPolicy: IfNotPresent
+  repository: jboss/keycloak
+  tag: 6.0.1
+  pullPolicy: IfNotPresent
 spec:
   replicas: 1
   selector:

diff --git a/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
index 77ca3fe..2e47a05 100644 (file)
--- a/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
@@ -19,13 +19,13 @@ zookeeper:
 hdfs-config-k8s:
   ## Custom hadoop config keys passed to the hdfs configmap as extra keys.
   customHadoopConfig:
-     coreSite: {}
-      ## Set config key and value pairs, e.g.
-      # hadoop.http.authentication.type: kerberos
+    coreSite: {}
+     ## Set config key and value pairs, e.g.
+     # hadoop.http.authentication.type: kerberos
 
-     hdfsSite: {}
-      ## Set config key and value pairs, e.g.
-      # dfs.datanode.use.datanode.hostname: "false"
+    hdfsSite: {}
+     ## Set config key and value pairs, e.g.
+     # dfs.datanode.use.datanode.hostname: "false"
 
 ## ------------------------------------------------------------------------------
 ## hdfs-journalnode-k8s: