X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Ftraffic_server.py;h=c87f8c32f0c69530d4029e8d76a7b54bbe78aa57;hb=95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce;hp=05f20e56225413e3abb44f055d6cb29daa6a7abe;hpb=04a7de082bd221eae3c7004f4e0b99dfa4f8be91;p=nfvbench.git diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py index 05f20e5..c87f8c3 100644 --- a/nfvbench/traffic_server.py +++ b/nfvbench/traffic_server.py @@ -12,11 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -from log import LOG import os import subprocess import yaml +from .log import LOG + + class TrafficServerException(Exception): pass @@ -29,36 +31,115 @@ class TRexTrafficServer(TrafficServer): def __init__(self, trex_base_dir='/opt/trex'): contents = os.listdir(trex_base_dir) # only one version of TRex should be supported in container - assert(len(contents) == 1) + assert len(contents) == 1 self.trex_dir = os.path.join(trex_base_dir, contents[0]) - def run_server(self, traffic_profile, filename='/etc/trex_cfg.yaml'): - """ - Runs TRex server for specified traffic profile. + def run_server(self, generator_config, filename='/etc/trex_cfg.yaml'): + """Run TRex server for specified traffic profile. :param traffic_profile: traffic profile object based on config file :param filename: path where to save TRex config file """ - cfg = self.__save_config(traffic_profile, filename) - cores = traffic_profile.cores - subprocess.Popen(['nohup', '/bin/bash', '-c', - './t-rex-64 -i -c {} --iom 0 --no-scapy-server --close-at-end --vlan' - ' --cfg {} &> /tmp/trex.log & disown'.format(cores, cfg)], - cwd=self.trex_dir) + cfg = self.__save_config(generator_config, filename) + cores = generator_config.cores + vtep_vlan = generator_config.gen_config.get('vtep_vlan') + sw_mode = "--software" if generator_config.software_mode else "" + vlan_opt = "--vlan" if (generator_config.vlan_tagging or vtep_vlan) else "" + if generator_config.mbuf_factor: + mbuf_opt = "--mbuf-factor " + str(generator_config.mbuf_factor) + else: + mbuf_opt = "" + hdrh_opt = "--hdrh" if generator_config.hdrh else "" + # --unbind-unused-ports: for NIC that have more than 2 ports such as Intel X710 + # this will instruct trex to unbind all ports that are unused instead of + # erroring out with an exception (i40e only) + cmd = ['nohup', '/bin/bash', '-c', + './t-rex-64 -i -c {} --iom 0 --no-scapy-server ' + '--unbind-unused-ports --close-at-end {} {} ' + '{} {} --cfg {} &> /tmp/trex.log & disown'.format(cores, sw_mode, + vlan_opt, + hdrh_opt, + mbuf_opt, cfg)] + LOG.info(' '.join(cmd)) + subprocess.Popen(cmd, cwd=self.trex_dir) LOG.info('TRex server is running...') - def __save_config(self, traffic_profile, filename): - ifs = ",".join([repr(pci) for pci in traffic_profile.pcis]) - - result = """# Config generated by NFVBench tool - - port_limit : 2 - version : 2 - interfaces : [{ifs}]""".format(ifs=ifs) + def __load_config(self, filename): + result = {} + if os.path.exists(filename): + with open(filename, 'r') as stream: + try: + result = yaml.safe_load(stream) + except yaml.YAMLError as exc: + print(exc) + return result + def __save_config(self, generator_config, filename): + result = self.__prepare_config(generator_config) yaml.safe_load(result) if os.path.exists(filename): os.remove(filename) with open(filename, 'w') as f: f.write(result) - return filename + + def __prepare_config(self, generator_config): + ifs = ",".join([repr(pci) for pci in generator_config.pcis]) + result = """# Config generated by NFVbench + - port_limit : 2 + version : 2 + zmq_pub_port : {zmq_pub_port} + zmq_rpc_port : {zmq_rpc_port} + prefix : {prefix} + limit_memory : {limit_memory} + interfaces : [{ifs}]""".format(zmq_pub_port=generator_config.zmq_pub_port, + zmq_rpc_port=generator_config.zmq_rpc_port, + prefix=generator_config.name, + limit_memory=generator_config.limit_memory, + ifs=ifs) + if hasattr(generator_config, 'mbuf_64') and generator_config.mbuf_64: + result += """ + memory : + mbuf_64 : {mbuf_64}""".format(mbuf_64=generator_config.mbuf_64) + + if self.__check_platform_config(generator_config): + try: + platform = """ + platform : + master_thread_id : {master_thread_id} + latency_thread_id : {latency_thread_id} + dual_if:""".format(master_thread_id=generator_config.gen_config.platform. + master_thread_id, + latency_thread_id=generator_config.gen_config.platform. + latency_thread_id) + result += platform + + for core in generator_config.gen_config.platform.dual_if: + threads = "" + try: + threads = ",".join([repr(thread) for thread in core.threads]) + except TypeError: + LOG.warning("No threads defined for socket %s", core.socket) + core_result = """ + - socket : {socket} + threads : [{threads}]""".format(socket=core.socket, threads=threads) + result += core_result + except (KeyError, AttributeError): + pass + return result + + def __check_platform_config(self, generator_config): + return hasattr(generator_config.gen_config, 'platform') \ + and hasattr(generator_config.gen_config.platform, "master_thread_id") \ + and generator_config.gen_config.platform.master_thread_id is not None \ + and hasattr(generator_config.gen_config.platform, "latency_thread_id") \ + and generator_config.gen_config.platform.latency_thread_id is not None + + def check_config_updated(self, generator_config): + existing_config = self.__load_config(filename='/etc/trex_cfg.yaml') + new_config = yaml.safe_load(self.__prepare_config(generator_config)) + LOG.debug("Existing config: %s", existing_config) + LOG.debug("New config: %s", new_config) + if existing_config == new_config: + return False + return True