From 0ce8b15c094a1e43e13eec67e6d4f35c898533f8 Mon Sep 17 00:00:00 2001
From: Anuradha Hegde <hegdean@dev02.trafodion.org>
Date: Tue, 3 Nov 2015 17:53:50 +0000
Subject: [PATCH] Cleanup the scripts to remove HP names

---
 core/sqf/sql/scripts/install_traf_components | 2 ++
 dcs/src/test/pytests/.env.sh.tmpl            | 2 +-
 dcs/src/test/pytests/.odbc.ini.tmpl          | 2 --
 tests/phx/phoenix_test.py                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index 5c293c6796..c089fb45ed 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -453,6 +453,8 @@ fi
 
 # End setup of PyODBC test
 
+source $HOME/.trafodion
+
 cds
 
 echo | tee -a ${MY_LOG_FILE}
diff --git a/dcs/src/test/pytests/.env.sh.tmpl b/dcs/src/test/pytests/.env.sh.tmpl
index 6e7ca189ab..5c5f2ddec8 100644
--- a/dcs/src/test/pytests/.env.sh.tmpl
+++ b/dcs/src/test/pytests/.env.sh.tmpl
@@ -27,7 +27,7 @@
 export LANG=en_US.utf8
 
 #--------------------------------------------------------------------
-# HPODBC enviroment variables
+# ODBC enviroment variables
 #--------------------------------------------------------------------
 export LD_LIBRARY_PATH=TEMPLATE_ODBC_LIB
 export LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/dcs/src/test/pytests/.odbc.ini.tmpl b/dcs/src/test/pytests/.odbc.ini.tmpl
index 2783af0ae4..559ac749a0 100644
--- a/dcs/src/test/pytests/.odbc.ini.tmpl
+++ b/dcs/src/test/pytests/.odbc.ini.tmpl
@@ -34,7 +34,6 @@ Server                      = TCP:TEMPLATE_DSN
 SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
 SQL_LOGIN_TIMEOUT           = SYSTEM_DEFAULT
 SQL_QUERY_TIMEOUT           = NO_TIMEOUT
-ServiceName                 = HP_DEFAULT_SERVICE
 
 [TDM_Default_DataSource]
 Description                 = Trafodion test system
@@ -47,5 +46,4 @@ Server                      = TCP:TEMPLATE_DSN
 SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
 SQL_LOGIN_TIMEOUT           = SYSTEM_DEFAULT
 SQL_QUERY_TIMEOUT           = NO_TIMEOUT
-ServiceName                 = HP_DEFAULT_SERVICE
 
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index 13a891c9a1..54fea68d51 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -821,7 +821,7 @@ def generate_summary(output):
     gvars.my_RUN_CMD = (os.path.join(ArgList._javahome, 'bin/java') + ' -cp ' + myclasspath +
                         ' ' + myoptions + ' -Duser.timezone=GMT -Dtrafjdbc.properties=' +
                         ArgList._prop_file + ' org.junit.runner.JUnitCore ' +
-                        'test.java.com.hp.phoenix.end2end.')
+                        'test.java.org.trafodion.phoenix.end2end.')
 
     # Generate list of tests if needed
     if ArgList._tests is None: