diff options
10 files changed, 21 insertions, 315 deletions
diff --git a/sfc/lib/config.py b/sfc/lib/config.py index e6149081..541f6847 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -43,22 +43,7 @@ class CommonConfig(object): self.vnffgd_dir = os.path.join(self.sfc_test_dir, "vnffgd-templates") self.functest_results_dir = os.path.join( getattr(config.CONF, 'dir_results'), "odl-sfc") - - # We need to know the openstack version in order to use one config or - # another. For Pike we will use config-pike.yaml. Queens and Rocky - # will use config.yaml - if 'OPENSTACK_OSA_VERSION' in os.environ: - if os.environ['OPENSTACK_OSA_VERSION'] == 'stable/pike': - self.config_file = os.path.join(self.sfc_test_dir, - "config-pike.yaml") - else: - self.config_file = os.path.join(self.sfc_test_dir, - "config.yaml") - else: - self.config_file = os.path.join(self.sfc_test_dir, - "config-pike.yaml") - - logger.info("The config file used is {}".format(self.config_file)) + self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") self.vim_file = os.path.join(self.sfc_test_dir, "register-vim.json") self.installer_type = env.get('INSTALLER_TYPE') diff --git a/sfc/tests/functest/config-pike.yaml b/sfc/tests/functest/config-pike.yaml deleted file mode 100644 index eff95c08..00000000 --- a/sfc/tests/functest/config-pike.yaml +++ /dev/null @@ -1,84 +0,0 @@ ---- -defaults: - # odl-sfc uses custom flavors as per below params - flavor: custom - ram_size_in_mb: 500 - disk_size_in_gb: 1 - vcpu_count: 1 - image_name: sfc_nsh_fraser - installer: - fuel: - user: root - password: r00tme - cluster: 1 # Change this to the id of the desired fuel env (1, 2, 3...) - apex: - user: stack - pkey_file: "/root/.ssh/id_rsa" - osa: - user: root - pkey_file: "/root/.ssh/id_rsa" - compass: - user: root - pkey_file: "/root/.ssh/id_rsa" - image_format: qcow2 - image_url: "http://artifacts.opnfv.org/sfc/images/sfc_nsh_fraser.qcow2" - vnfd-dir: "vnfd-templates" - vnfd-default-params-file: "test-vnfd-default-params.yaml" - - -testcases: - 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: "test-one-chain-vnfd1.yaml" - test_vnfd_blue: "test-one-chain-vnfd2.yaml" - test_vnffgd_red: "test-one-chain-vnffgd-pike.yaml" - - sfc_two_chains_SSH_and_HTTP: - enabled: false - order: 1 - description: "ODL-SFC tests with two chains and one SF per 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: "test-two-chains-vnfd1.yaml" - test_vnfd_blue: "test-two-chains-vnfd2.yaml" - test_vnffgd_red: "test-two-chains-vnffgd1-pike.yaml" - test_vnffgd_blue: "test-two-chains-vnffgd2-pike.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: "test-symmetric-vnfd.yaml" - test_vnffgd: "test-symmetric-vnffgd.yaml" - source_port: 22222 - - sfc_chain_deletion: - enabled: false - order: 3 - description: "Verify if chains work correctly after deleting one" - 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-one-chain-vnfd1.yaml" - test_vnffgd_red: "test-deletion-vnffgd-pike.yaml" diff --git a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd-pike.yaml b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd-pike.yaml deleted file mode 100644 index 3f10e6b8..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd-pike.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_HTTP Test - -topology_template: - description: topology-template-test2 - inputs: - net_src_port_id: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 1 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - - destination_port_range: 80-80 - - ip_proto: 6 - path: - - forwarder: test-vnfd1 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 1 - dependent_virtual_link: [VL1] - connection_point: [CP1] - constituent_vnfs: [test-vnfd1] - members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml index 28b78ead..fd549079 100644 --- a/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml +++ b/sfc/tests/functest/vnffgd-templates/test-deletion-vnffgd.yaml @@ -10,16 +10,18 @@ topology_template: node_templates: Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker + type: tosca.nodes.nfv.FP.TackerV2 description: creates path properties: id: 1 policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 80-80 - ip_proto: 6 + - name: http_classifier + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 80-80 + ip_proto: 6 path: - forwarder: test-vnfd1 capability: CP1 diff --git a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd-pike.yaml b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd-pike.yaml deleted file mode 100644 index 27c7d545..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd-pike.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case1 - -topology_template: - description: topology-template-test1 - inputs: - net_src_port_id: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 1 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - - destination_port_range: 80-80 - - ip_proto: 6 - path: - - forwarder: test-vnfd1 - capability: CP1 - - forwarder: test-vnfd2 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 2 - dependent_virtual_link: [VL1, VL1] - connection_point: [CP1, CP1] - constituent_vnfs: [test-vnfd1, test-vnfd2] - members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml index 544d6e8e..4dcc0f3c 100644 --- a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml +++ b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml @@ -10,16 +10,18 @@ topology_template: node_templates: Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker + type: tosca.nodes.nfv.FP.TackerV2 description: creates path properties: id: 1 policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 80-80 - ip_proto: 6 + - name: http_classifier + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 80-80 + ip_proto: 6 path: - forwarder: test-vnfd1 capability: CP1 diff --git a/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml index 6b14df1b..371d25fe 100644 --- a/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml +++ b/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml @@ -14,18 +14,20 @@ topology_template: node_templates: Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker + type: tosca.nodes.nfv.FP.TackerV2 description: creates path properties: id: 1 policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_port_id} - - network_dst_port_id: {get_input: net_dst_port_id} - - ip_dst_prefix: {get_input: ip_dst_prefix} - - destination_port_range: 80-80 - - ip_proto: 6 + - name: http_classifier + classifier: + network_src_port_id: {get_input: net_src_port_id} + network_dst_port_id: {get_input: net_dst_port_id} + ip_dst_prefix: {get_input: ip_dst_prefix} + destination_port_range: 80-80 + ip_proto: 6 path: - forwarder: test-vnfd1 capability: CP1 diff --git a/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml-queens deleted file mode 100644 index c40c447c..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-symmetric-vnffgd.yaml-queens +++ /dev/null @@ -1,46 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case-symmetric - -topology_template: - description: topology-template-test1 - inputs: - net_src_port_id: - type: string - net_dst_port_id: - type: string - ip_dst_prefix: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 1 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - network_dst_port_id: {get_input: net_dst_port_id} - ip_dst_prefix: {get_input: ip_dst_prefix} - destination_port_range: 80-80 - ip_proto: 6 - path: - - forwarder: test-vnfd1 - capability: CP1 - - forwarder: test-vnfd1 - capability: CP2 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 2 - dependent_virtual_link: [VL1, VL1] - connection_point: [CP1, CP2] - constituent_vnfs: [test-vnfd1, test-vnfd1] - members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1-pike.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1-pike.yaml deleted file mode 100644 index f0615e4e..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1-pike.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_HTTP Test - -topology_template: - description: topology-template-test2 - inputs: - net_src_port_id: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 1 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - - destination_port_range: 22-80 - - ip_proto: 6 - path: - - forwarder: test-vnfd1 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 1 - dependent_virtual_link: [VL1] - connection_point: [CP1] - constituent_vnfs: [test-vnfd1] - members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2-pike.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2-pike.yaml deleted file mode 100644 index ec18c9d6..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2-pike.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_SSH Test - -topology_template: - description: topology-template-test2 - inputs: - net_src_port_id: - type: string - - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 2 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - - destination_port_range: 22-80 - - ip_proto: 6 - path: - - forwarder: test-vnfd2 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 1 - dependent_virtual_link: [VL1] - connection_point: [CP1] - constituent_vnfs: [test-vnfd2] - members: [Forwarding_path1] |