X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2FVariables.py;h=a29f9a3b434ae134068abb75c79b96dd83a9bb52;hb=01dcc007b6e669a2baf92e8d091d579e99a92ac7;hp=1fe9235c82df90f056806618f92602e416fe0496;hpb=c61095fb77ca6e7083f57ceed4b839858e91b454;p=integration%2Ftest.git diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py index 1fe9235c82..a29f9a3b43 100644 --- a/csit/variables/Variables.py +++ b/csit/variables/Variables.py @@ -28,10 +28,10 @@ TOOLS_SYSTEM_PROMPT = DEFAULT_LINUX_PROMPT # KARAF Variables KARAF_SHELL_PORT = '8101' ESCAPE_CHARACTER = '\x1B' -KARAF_DETAILED_PROMPT = '@' + ESCAPE_CHARACTER + '[0m' + ESCAPE_CHARACTER + '[34mroot' + ESCAPE_CHARACTER + '[0m>' +KARAF_PROMPT_LOGIN = 'opendaylight-user' KARAF_USER = 'karaf' KARAF_PASSWORD = 'karaf' -KARAF_PROMPT = 'opendaylight-user' +KARAF_PROMPT = 'opendaylight-user.*root.*>' # Logging levels DEFAULT_ODL_LOG_LEVEL = 'INFO' @@ -136,21 +136,11 @@ GET_INTENTS_URI = '/retconf/config/intent:intents' AUTH_TOKEN_API = '/oauth2/token' REVOKE_TOKEN_API = '/oauth2/revoke' -# Base Mininet Mac address. DPID of mininet switches will be derived from this. -BASE_MAC_1 = '00:4b:00:00:00:00' -# Base IP of mininet hosts -BASE_IP_1 = '75.75.0.0' - # Vlan Custom Topology Path and File CREATE_VLAN_TOPOLOGY_FILE = "vlan_vtn_test.py" CREATE_VLAN_TOPOLOGY_FILE_PATH = "MininetTopo/" +\ CREATE_VLAN_TOPOLOGY_FILE -# Mininet Custom Topology Path and File -CREATE_FULLYMESH_TOPOLOGY_FILE = "create_fullymesh.py" -CREATE_FULLYMESH_TOPOLOGY_FILE_PATH = "libraries/MininetTopo/" +\ - CREATE_FULLYMESH_TOPOLOGY_FILE - # Mininet Custom Topology Path and File for Path Policy CREATE_PATHPOLICY_TOPOLOGY_FILE = "topo-3sw-2host_multipath.py" CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH = "MininetTopo/" +\