Change ODL port from 6633 to 6653

[integration/test.git] / csit / variables / Variables.py

diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py
index eb087fb22c5182e9db6340fe74b32098a3dd1e77..a29f9a3b434ae134068abb75c79b96dd83a9bb52 100644 (file)
--- 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/" +\
@@ -172,6 +162,7 @@ LFM_SB_RPC_API = "/restconf/operations/odl-lisp-sb"
 # Neutron
 NEUTRON_NB_API = '/controller/nb/v2/neutron'
 NEUTRON_NETWORKS_API = NEUTRON_NB_API + '/' + 'networks'
+NEUTRON_SUBNETS_API = NEUTRON_NB_API + '/' + 'subnets'
 NEUTRON_PORTS_API = NEUTRON_NB_API + '/' + 'ports'
 NEUTRON_ROUTERS_API = NEUTRON_NB_API + '/' + 'routers'
 OSREST = '/v2.0/networks'