diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/gen_scale_out_test.yml | 26 | ||||
| -rwxr-xr-x | ansible/roles/download_pmu_tools/files/event_download_local.py | 213 | ||||
| -rw-r--r-- | ansible/roles/download_pmu_tools/tasks/main.yml | 9 | ||||
| -rw-r--r-- | ansible/roles/install_image_dependencies/defaults/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/install_samplevnf/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/scale_out_test_templates.yml | 52 |
6 files changed, 85 insertions, 222 deletions
diff --git a/ansible/gen_scale_out_test.yml b/ansible/gen_scale_out_test.yml new file mode 100644 index 000000000..a76ea0ac2 --- /dev/null +++ b/ansible/gen_scale_out_test.yml @@ -0,0 +1,26 @@ +# Copyright (c) 2017 Intel Corporation. # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- hosts: localhost + connection: local + vars: + vnf_range: + - 2 + - 4 + - 10 + + + tasks: + - include: scale_out_test_templates.yml + with_items: "{{ vnf_range }}" + diff --git a/ansible/roles/download_pmu_tools/files/event_download_local.py b/ansible/roles/download_pmu_tools/files/event_download_local.py deleted file mode 100755 index 8eda2cd0d..000000000 --- a/ansible/roles/download_pmu_tools/files/event_download_local.py +++ /dev/null @@ -1,213 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2014, Intel Corporation -# Author: Andi Kleen -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# Automatic event list downloader -# -# event_download.py download for current cpu -# event_download.py -a download all -# event_download.py cpustr... Download for specific CPU -from __future__ import absolute_import -from __future__ import print_function -import sys - -import re -import os -import string -from fnmatch import fnmatch -from shutil import copyfile - -try: - from urllib2 import URLError -except ImportError: - # python 3 - from urllib.error import URLError - - -urlpath = 'https://download.01.org/perfmon' -localpath = 'pmu_local_mirror/download.01.org/perfmon' -mapfile = 'mapfile.csv' -modelpath = localpath + "/" + mapfile -NSB_JSON = os.environ.get("PMU_EVENTS_PATH", "/tmp/pmu_event.json") - - -def get_cpustr(): - with open('/proc/cpuinfo', 'r') as f: - cpu = [None, None, None] - for j in f: - n = j.split() - if n[0] == 'vendor_id': - cpu[0] = n[2] - elif n[0] == 'model' and n[1] == ':': - cpu[2] = int(n[2]) - elif n[0] == 'cpu' and n[1] == 'family': - cpu[1] = int(n[3]) - if all(cpu): - break - return "%s-%d-%X" % (cpu[0], cpu[1], cpu[2]) - - -def sanitize(s, a): - o = "" - for j in s: - if j in a: - o += j - return o - - -def getdir(): - try: - d = os.getenv("XDG_CACHE_HOME") - xd = d - if not d: - home = os.getenv("HOME") - d = "%s/.cache" % home - d += "/pmu-events" - if not os.path.isdir(d): - # try to handle the sudo case - if not xd: - user = os.getenv("SUDO_USER") - if user: - nd = os.path.expanduser("~" + user) + "/.cache/pmu-events" - if os.path.isdir(nd): - return nd - os.makedirs(d) - return d - except OSError: - raise Exception('Cannot access ' + d) - - -NUM_TRIES = 3 - - -def getfile(url, dir, fn): - tries = 0 - print("Downloading", url, "to", fn) - while True: - try: - f = open(url) - data = f.read() - except IOError: - tries += 1 - if tries >= NUM_TRIES: - raise - print("retrying download") - continue - break - with open(os.path.join(dir, fn), "w") as o: - o.write(data) - f.close() - - -allowed_chars = string.ascii_letters + '_-.' + string.digits - - -def download(match, key=None, link=True): - found = 0 - dir = getdir() - try: - getfile(modelpath, dir, "mapfile.csv") - models = open(os.path.join(dir, "mapfile.csv")) - for j in models: - n = j.rstrip().split(",") - if len(n) < 4: - if len(n) > 0: - print("Cannot parse", n) - continue - cpu, version, name, type = n - if not fnmatch(cpu, match) or (key is not None and type not in key) or type.startswith("EventType"): - continue - cpu = sanitize(cpu, allowed_chars) - url = localpath + name - fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars)) - try: - os.remove(os.path.join(dir, fn)) - except OSError: - pass - getfile(url, dir, fn) - if link: - lname = re.sub(r'.*/', '', name) - lname = sanitize(lname, allowed_chars) - try: - os.remove(os.path.join(dir, lname)) - except OSError: - pass - try: - os.symlink(fn, os.path.join(dir, lname)) - except OSError as e: - print("Cannot link %s to %s:" % (name, lname), e, file=sys.stderr) - found += 1 - models.close() - getfile(localpath + "/readme.txt", dir, "readme.txt") - except URLError as e: - print("Cannot access event server:", e, file=sys.stderr) - print("If you need a proxy to access the internet please set it with:", file=sys.stderr) - print("\texport https_proxy=http://proxyname...", file=sys.stderr) - print("If you are not connected to the internet please run this on a connected system:", file=sys.stderr) - print("\tevent_download.py '%s'" % match, file=sys.stderr) - print("and then copy ~/.cache/pmu-events to the system under test", file=sys.stderr) - print("To get events for all possible CPUs use:", file=sys.stderr) - print("\tevent_download.py -a", file=sys.stderr) - except OSError as e: - print("Cannot write events file:", e, file=sys.stderr) - return found - - -def download_current(link=False): - """Download JSON event list for current cpu. - Returns >0 when a event list is found""" - return download(get_cpustr(), link=link) - - -def eventlist_name(name=None, key="core"): - if not name: - name = get_cpustr() - cache = getdir() - return "%s/%s-%s.json" % (cache, name, key) - - -if __name__ == '__main__': - # only import argparse when actually called from command line - # this makes ocperf work on older python versions without it. - import argparse - p = argparse.ArgumentParser(usage='download Intel event files') - p.add_argument('--all', '-a', help='Download all available event files', action='store_true') - p.add_argument('--verbose', '-v', help='Be verbose', action='store_true') - p.add_argument('--mine', help='Print name of current CPU', action='store_true') - p.add_argument('--link', help='Create links with the original event file name', - action='store_true', default=True) - p.add_argument('cpus', help='CPU identifiers to download', nargs='*') - args = p.parse_args() - - cpustr = get_cpustr() - if args.verbose or args.mine: - print("My CPU", cpustr) - if args.mine: - sys.exit(0) - d = getdir() - if args.all: - found = download('*', link=args.link) - elif len(args.cpus) == 0: - found = download_current(link=args.link) - else: - found = 0 - for j in args.cpus: - found += download(j, link=args.link) - - if found == 0: - print("Nothing found", file=sys.stderr) - - el = eventlist_name() - if os.path.exists(el): - print("my event list", el) - copyfile(el, NSB_JSON) - print("File copied to ", NSB_JSON) diff --git a/ansible/roles/download_pmu_tools/tasks/main.yml b/ansible/roles/download_pmu_tools/tasks/main.yml index 3ef412217..37375b668 100644 --- a/ansible/roles/download_pmu_tools/tasks/main.yml +++ b/ansible/roles/download_pmu_tools/tasks/main.yml @@ -31,11 +31,6 @@ - name: Create perfmon local mirror command: "wget -mkEpnp {{ perfmon_url }} -P {{ INSTALL_BIN_PATH }}/pmu_local_mirror" ignore_errors: yes + failed_when: false #some of the links while creating mirror are not found, results in failure + no_log: True -- name: Copy local event download file - copy: - src: event_download_local.py - dest: "{{ INSTALL_BIN_PATH }}/event_download_local.py" - owner: root - group: root - mode: 0755 diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml index 1540806cc..362fa351b 100644 --- a/ansible/roles/install_image_dependencies/defaults/main.yml +++ b/ansible/roles/install_image_dependencies/defaults/main.yml @@ -22,6 +22,9 @@ install_dependencies: - unzip # for Trex - libpython2.7-dev + # for IxLoad + - libxft-dev + - libxss-dev RedHat: - bc - fio diff --git a/ansible/roles/install_samplevnf/tasks/main.yml b/ansible/roles/install_samplevnf/tasks/main.yml index d2deb5894..b5d33f668 100644 --- a/ansible/roles/install_samplevnf/tasks/main.yml +++ b/ansible/roles/install_samplevnf/tasks/main.yml @@ -29,9 +29,9 @@ RTE_TARGET: "{{ RTE_TARGET }}" VNF_CORE: "{{ samplevnf_path }}" -- name: set soft CRC for PROX when building in VM +- name: set soft CRC and GEN_DECAP_IPV6_TO_IPV4_CKSUM for PROX when building in VM set_fact: - build_env_vars: "{{ build_env_vars|combine({'crc': 'soft'}) }}" + build_env_vars: "{{ build_env_vars|combine({'crc': 'soft'})|combine({'GEN_DECAP_IPV6_TO_IPV4_CKSUM':'y'}) }}" when: vnf_name == "PROX" and image_type is defined and image_type == "vm" - name: "make {{ vnf_name }} clean" diff --git a/ansible/scale_out_test_templates.yml b/ansible/scale_out_test_templates.yml new file mode 100644 index 000000000..487319f2a --- /dev/null +++ b/ansible/scale_out_test_templates.yml @@ -0,0 +1,52 @@ +# Copyright (c) 2017 Intel Corporation. # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- + +- set_fact: + num_vnfs: "{{ item }}" + +- debug: + var: num_vnfs + verbosity: 2 + +- template: + src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml + dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-out.yaml + dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_out.yaml + dest: ../samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-3node-scale-out.yaml + dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-3node-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_out.yaml + dest: ../samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node-scale-out.yaml + dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_out.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-scale-out.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-{{ num_vnfs }}.yaml |