X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2FVariables.py;h=e461d71e9c6d63e0d79a4a31f76a5f41d986f693;hb=fee1de2e68315d570c3125b8ae340811af06d01d;hp=65a1479cff55df978631c9622dbca6cb514f0e66;hpb=35a9bd0ffa1c1f0ceeb742de2e3a420e52d4f5f1;p=integration%2Ftest.git

diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py
index 65a1479cff..e461d71e9c 100644
--- a/csit/variables/Variables.py
+++ b/csit/variables/Variables.py
@@ -8,6 +8,7 @@ Edited: Many times by many people
 
 # VM Environment defaults
 DEFAULT_LINUX_PROMPT = '>'
+DEFAULT_LINUX_PROMPT_STRICT = ']>'
 DEFAULT_USER = 'jenkins'
 DEFAULT_TIMEOUT = '30s'
 
@@ -56,6 +57,7 @@ ODL_NETCONF_PROMPT = ']]>]]>'
 ODL_NETCONF_NAMESPACE = 'urn:ietf:params:xml:ns:netconf:base:1.0'
 
 # OpenFlow variables
+ODL_OF_PORT = '6633'
 ODL_OF_PLUGIN = 'lithium'
 
 # VTN Coordinator Variables
@@ -120,6 +122,7 @@ CONTROLLER_CONFIG_MOUNT = ('/restconf/config/network-topology:'
 CONFIG_API = '/restconf/config'
 OPERATIONAL_API = '/restconf/operational'
 MODULES_API = '/restconf/modules'
+VTN_INVENTORY_NODE_API = '/restconf/operational/vtn-inventory:vtn-nodes'
 
 # NEMO Variables
 PREDEFINE_ROLE_URI = '/restconf/config/nemo-user:user-roles'
@@ -133,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/" +\
@@ -169,9 +162,10 @@ 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'
-KARAF_HOME = '${WORKSPACE}${/}${BUNDLEFOLDER}'
 
 # Openstack System Prompt
 OS_SYSTEM_PROMPT = '$'