X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Ftopology.py;h=13dbdddb07f0f6e29975073429669264fde56c5d;hp=a5a446008ba3da99af5a03360cc621f0a9d3a97e;hb=c7eb2002bcd007520309feb3e11a26ff847a4e05;hpb=92cbb44a89ca808df32e4a4cb137bed076a68a94 diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index a5a446008b..13dbdddb07 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # 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: @@ -21,7 +21,7 @@ from robot.api import logger from robot.libraries.BuiltIn import BuiltIn, RobotNotRunningError from robot.api.deco import keyword -__all__ = ["DICT__nodes", 'Topology'] +__all__ = ["DICT__nodes", 'Topology', 'NodeType'] def load_topo_from_yaml(): @@ -136,7 +136,7 @@ class Topology(object): :type nodes: dict :returns: Nothing """ - port_types = ('subinterface', 'vlan_subif', 'memif', 'tap', 'vhost', + port_types = ('subinterface', 'vlan_subif', 'memif', 'tap', 'vhost', 'loopback', 'gre_tunnel', 'vxlan_tunnel') for node_data in nodes.values(): @@ -904,6 +904,22 @@ class Topology(object): """ return node['host'] + @staticmethod + def get_node_arch(node): + """Return arch of the node. + Default to x86_64 if no arch present + + :param node: Node created from topology. + :type node: dict + :returns: Node architecture + :rtype: str + """ + try: + return node['arch'] + except KeyError: + node['arch'] = 'x86_64' + return 'x86_64' + @staticmethod def get_cryptodev(node): """Return Crytodev configuration of the node.