summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitrios Markou <mardim@intracom-telecom.com>2017-08-31 11:13:04 +0300
committerDimitrios Markou <mardim@intracom-telecom.com>2017-08-31 11:13:04 +0300
commit60f2b2cf578fbf2a9e0efba4709d4aa6aa8a2f79 (patch)
tree38aadf1439edcaac7fcc74cc8b47e906bd63d41b
parentfa5e8b4d5a0f3fda560c6667e944bfb989c73fb4 (diff)
Fix yamllint errors and warnings
Change-Id: I33f3fd0aa0bc71a1ee07ea4504619b090517a87b Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>
-rw-r--r--sfc/tests/functest/config.yaml81
-rw-r--r--sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml2
-rw-r--r--sfc/tests/functest/vnfd-templates/test-vnfd1.yaml5
-rw-r--r--sfc/tests/functest/vnfd-templates/test-vnfd2.yaml5
-rw-r--r--sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml5
-rw-r--r--sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml5
-rw-r--r--sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml5
-rw-r--r--sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml21
-rw-r--r--sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml15
-rw-r--r--sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml15
10 files changed, 84 insertions, 75 deletions
diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml
index 77e5ffc1..d28456dd 100644
--- a/sfc/tests/functest/config.yaml
+++ b/sfc/tests/functest/config.yaml
@@ -1,5 +1,6 @@
+---
defaults:
- #odl-sfc uses custom flavors as per below params
+ # odl-sfc uses custom flavors as per below params
flavor: custom
ram_size_in_mb: 1500
disk_size_in_gb: 10
@@ -7,11 +8,11 @@ defaults:
image_name: sfc_nsh_danube
image_file_name: sfc_nsh_danube.qcow2
installer:
- type: fuel
- ip: 10.20.0.2
- user: root
- password: r00tme
- cluster: 1 # Change this to the id of the desired fuel env (1, 2, 3...)
+ type: fuel
+ ip: 10.20.0.2
+ user: root
+ password: r00tme
+ cluster: 1 # Change this to the id of the desired fuel env (1, 2, 3...)
image_format: qcow2
url: "http://artifacts.opnfv.org/sfc/images"
vnfd-dir: "vnfd-templates"
@@ -19,41 +20,41 @@ defaults:
testcases:
sfc_two_chains_SSH_and_HTTP:
- enabled: true
- order: 1
- description: "ODL-SFC tests"
- net_name: example-net
- subnet_name: example-subnet
- router_name: example-router
- subnet_cidr: "11.0.0.0/24"
- secgroup_name: "example-sg"
- secgroup_descr: "Example Security group"
- test_vnfd_red: "test-vnfd1.yaml"
- test_vnfd_blue: "test-vnfd2.yaml"
+ enabled: true
+ order: 1
+ description: "ODL-SFC tests"
+ net_name: example-net
+ subnet_name: example-subnet
+ router_name: example-router
+ subnet_cidr: "11.0.0.0/24"
+ secgroup_name: "example-sg"
+ secgroup_descr: "Example Security group"
+ test_vnfd_red: "test-vnfd1.yaml"
+ test_vnfd_blue: "test-vnfd2.yaml"
sfc_one_chain_two_service_functions:
- enabled: true
- order: 0
- description: "ODL-SFC Testing SFs when they are located on the same chain"
- net_name: example-net
- subnet_name: example-subnet
- router_name: example-router
- subnet_cidr: "11.0.0.0/24"
- secgroup_name: "example-sg"
- secgroup_descr: "Example Security group"
- test_vnfd_red: "test2-vnfd1.yaml"
- test_vnfd_blue: "test2-vnfd2.yaml"
+ enabled: true
+ order: 0
+ description: "ODL-SFC Testing SFs when they are located on the same chain"
+ net_name: example-net
+ subnet_name: example-subnet
+ router_name: example-router
+ subnet_cidr: "11.0.0.0/24"
+ secgroup_name: "example-sg"
+ secgroup_descr: "Example Security group"
+ test_vnfd_red: "test2-vnfd1.yaml"
+ test_vnfd_blue: "test2-vnfd2.yaml"
sfc_symmetric_chain:
- enabled: false
- order: 2
- description: "Verify the behavior of a symmetric service chain"
- net_name: example-net
- subnet_name: example-subnet
- router_name: example-router
- subnet_cidr: "11.0.0.0/24"
- secgroup_name: "example-sg"
- secgroup_descr: "Example Security group"
- test_vnfd: "test3-vnfd1.yaml"
- allowed_source_port: 22222
- blocked_source_port: 33333
+ enabled: false
+ order: 2
+ description: "Verify the behavior of a symmetric service chain"
+ net_name: example-net
+ subnet_name: example-subnet
+ router_name: example-router
+ subnet_cidr: "11.0.0.0/24"
+ secgroup_name: "example-sg"
+ secgroup_descr: "Example Security group"
+ test_vnfd: "test3-vnfd1.yaml"
+ allowed_source_port: 22222
+ blocked_source_port: 33333
diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml
index bf9bd868..d87e6e68 100644
--- a/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml
+++ b/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml
@@ -1,5 +1,5 @@
+---
vdus:
vdu1:
param:
zone: nova
-
diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
index de8eecbe..277c1880 100644
--- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: firewall1-example
metadata:
@@ -18,7 +19,7 @@ topology_template:
disk_size: 10 GB
properties:
image: sfc_nsh_danube
- availability_zone: { get_input: zone }
+ availability_zone: {get_input: zone}
mgmt_driver: noop
config: |
param0: key1
@@ -52,4 +53,4 @@ topology_template:
type: tosca.nodes.nfv.VL
properties:
network_name: example-net
- vendor: Tacker \ No newline at end of file
+ vendor: Tacker
diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
index 3058d337..337e9412 100644
--- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
+++ b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: firewall2-example
metadata:
@@ -19,7 +20,7 @@ topology_template:
disk_size: 10 GB
properties:
image: sfc_nsh_danube
- availability_zone: { get_input: zone }
+ availability_zone: {get_input: zone}
mgmt_driver: noop
config: |
param0: key0
@@ -53,4 +54,4 @@ topology_template:
type: tosca.nodes.nfv.VL
properties:
network_name: example-net
- vendor: Tacker \ No newline at end of file
+ vendor: Tacker
diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
index 998bc511..cc5fed6f 100644
--- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: firewall1-example
metadata:
@@ -18,7 +19,7 @@ topology_template:
disk_size: 10 GB
properties:
image: sfc_nsh_danube
- availability_zone: { get_input: zone}
+ availability_zone: {get_input: zone}
mgmt_driver: noop
config: |
param0: key1
@@ -52,4 +53,4 @@ topology_template:
type: tosca.nodes.nfv.VL
properties:
network_name: example-net
- vendor: Tacker \ No newline at end of file
+ vendor: Tacker
diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
index 239e1aca..f8150f25 100644
--- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
+++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: firewall2-example
metadata:
@@ -18,7 +19,7 @@ topology_template:
disk_size: 10 GB
properties:
image: sfc_nsh_danube
- availability_zone: { get_input: zone }
+ availability_zone: {get_input: zone}
mgmt_driver: noop
config: |
param0: key1
@@ -52,4 +53,4 @@ topology_template:
type: tosca.nodes.nfv.VL
properties:
network_name: example-net
- vendor: Tacker \ No newline at end of file
+ vendor: Tacker
diff --git a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
index adc92f23..26491b5e 100644
--- a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
+++ b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: firewall3-example
metadata:
@@ -18,7 +19,7 @@ topology_template:
disk_size: 10 GB
properties:
image: sfc_nsh_danube
- availability_zone: { get_input: zone}
+ availability_zone: {get_input: zone}
mgmt_driver: noop
service_type: firewall
monitoring_policy:
@@ -49,4 +50,4 @@ topology_template:
type: tosca.nodes.nfv.VL
properties:
network_name: example-net
- vendor: Tacker \ No newline at end of file
+ vendor: Tacker
diff --git a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml
index 43cded97..9c696d2e 100644
--- a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml
@@ -1,3 +1,4 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
description: test-case1
@@ -18,15 +19,15 @@ topology_template:
policy:
type: ACL
criteria:
- - network_src_port_id: { get_input: net_src_id }
+ - network_src_port_id: {get_input: net_src_id}
- destination_port_range: 80-80
- ip_proto: 6
- - ip_dst_prefix: { get_input: ip_dst }
+ - ip_dst_prefix: {get_input: ip_dst}
path:
- - forwarder: VNFD1
- capability: CP1
- - forwarder: VNFD2
- capability: CP1
+ - forwarder: VNFD1
+ capability: CP1
+ - forwarder: VNFD2
+ capability: CP1
groups:
VNFFG1:
@@ -36,7 +37,7 @@ topology_template:
vendor: tacker
version: 1.0
number_of_endpoints: 2
- dependent_virtual_link: [VL1,VL1]
- connection_point: [CP1,CP1]
- constituent_vnfs: [VNFD1,VNFD2]
- members: [Forwarding_path1] \ No newline at end of file
+ dependent_virtual_link: [VL1, VL1]
+ connection_point: [CP1, CP1]
+ constituent_vnfs: [VNFD1, VNFD2]
+ members: [Forwarding_path1]
diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml
index ba2d8ebf..a15e94cc 100644
--- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml
@@ -1,5 +1,6 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-case2: HTTP Test
+description: test-case2_HTTP Test
topology_template:
description: topology-template-test2
@@ -18,10 +19,10 @@ topology_template:
policy:
type: ACL
criteria:
- - network_src_port_id: { get_input: net_src_id }
+ - network_src_port_id: {get_input: net_src_id}
- destination_port_range: 80-80
- ip_proto: 6
- - ip_dst_prefix: { get_input: ip_dst }
+ - ip_dst_prefix: {get_input: ip_dst}
path:
- forwarder: VNFD1
capability: CP1
@@ -36,7 +37,7 @@ topology_template:
vendor: tacker
version: 1.0
number_of_endpoints: 2
- dependent_virtual_link: [VL1,VL1]
- connection_point: [CP1,CP1]
- constituent_vnfs: [VNFD1,VNFD2]
- members: [Forwarding_path1] \ No newline at end of file
+ dependent_virtual_link: [VL1, VL1]
+ connection_point: [CP1, CP1]
+ constituent_vnfs: [VNFD1, VNFD2]
+ members: [Forwarding_path1]
diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml
index 5d46d24b..80a41edd 100644
--- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml
+++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml
@@ -1,5 +1,6 @@
+---
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-description: test-case2: SSH Test
+description: test-case2_SSH Test
topology_template:
description: topology-template-test2
@@ -18,10 +19,10 @@ topology_template:
policy:
type: ACL
criteria:
- - network_src_port_id: { get_input: net_src_id }
+ - network_src_port_id: {get_input: net_src_id}
- destination_port_range: 22-22
- ip_proto: 6
- - ip_dst_prefix: { get_input: ip_dst }
+ - ip_dst_prefix: {get_input: ip_dst}
path:
- forwarder: VNFD1
capability: CP1
@@ -36,7 +37,7 @@ topology_template:
vendor: tacker
version: 1.0
number_of_endpoints: 2
- dependent_virtual_link: [VL1,VL1]
- connection_point: [CP1,CP1]
- constituent_vnfs: [VNFD1,VNFD2]
- members: [Forwarding_path1] \ No newline at end of file
+ dependent_virtual_link: [VL1, VL1]
+ connection_point: [CP1, CP1]
+ constituent_vnfs: [VNFD1, VNFD2]
+ members: [Forwarding_path1]