Yaniv Dary has uploaded a new change for review. Change subject: etl: ssl trust store is now loaded dynamically ......................................................................
etl: ssl trust store is now loaded dynamically Change-Id: Iae5aeb4dd4a29fdf76551b23ebd077c594b6f60e Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_2/HistoryETL.java M data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.item M data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.properties M data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.item M data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.properties M packaging/ovirt-engine-dwh-setup.py 6 files changed, 970 insertions(+), 110 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/81/12681/1 diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_2/HistoryETL.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_2/HistoryETL.java index af18e9d..82d8ca6 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_2/HistoryETL.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/historyetl_3_2/HistoryETL.java @@ -160,27 +160,6 @@ } - if (ovirtEnginePortalAddress != null) { - - this.setProperty("ovirtEnginePortalAddress", - ovirtEnginePortalAddress.toString()); - - } - - if (ovirtEnginePortalConnectionProtocol != null) { - - this.setProperty("ovirtEnginePortalConnectionProtocol", - ovirtEnginePortalConnectionProtocol.toString()); - - } - - if (ovirtEnginePortalPort != null) { - - this.setProperty("ovirtEnginePortalPort", ovirtEnginePortalPort - .toString()); - - } - if (ovirtEngineHistoryDbDriverClass != null) { this.setProperty("ovirtEngineHistoryDbDriverClass", @@ -209,6 +188,27 @@ } + if (ovirtEnginePortalAddress != null) { + + this.setProperty("ovirtEnginePortalAddress", + ovirtEnginePortalAddress.toString()); + + } + + if (ovirtEnginePortalConnectionProtocol != null) { + + this.setProperty("ovirtEnginePortalConnectionProtocol", + ovirtEnginePortalConnectionProtocol.toString()); + + } + + if (ovirtEnginePortalPort != null) { + + this.setProperty("ovirtEnginePortalPort", ovirtEnginePortalPort + .toString()); + + } + if (runDeleteTime != null) { this.setProperty("runDeleteTime", runDeleteTime.toString()); @@ -225,6 +225,18 @@ this.setProperty("timeBetweenErrorEvents", timeBetweenErrorEvents.toString()); + + } + + if (TruststorePass != null) { + + this.setProperty("TruststorePass", TruststorePass.toString()); + + } + + if (TruststoreUrl != null) { + + this.setProperty("TruststoreUrl", TruststoreUrl.toString()); } @@ -278,24 +290,6 @@ return this.ovirtEngineDbUser; } - public String ovirtEnginePortalAddress; - - public String getOvirtEnginePortalAddress() { - return this.ovirtEnginePortalAddress; - } - - public String ovirtEnginePortalConnectionProtocol; - - public String getOvirtEnginePortalConnectionProtocol() { - return this.ovirtEnginePortalConnectionProtocol; - } - - public String ovirtEnginePortalPort; - - public String getOvirtEnginePortalPort() { - return this.ovirtEnginePortalPort; - } - public String ovirtEngineHistoryDbDriverClass; public String getOvirtEngineHistoryDbDriverClass() { @@ -320,6 +314,24 @@ return this.ovirtEngineHistoryDbUser; } + public String ovirtEnginePortalAddress; + + public String getOvirtEnginePortalAddress() { + return this.ovirtEnginePortalAddress; + } + + public String ovirtEnginePortalConnectionProtocol; + + public String getOvirtEnginePortalConnectionProtocol() { + return this.ovirtEnginePortalConnectionProtocol; + } + + public String ovirtEnginePortalPort; + + public String getOvirtEnginePortalPort() { + return this.ovirtEnginePortalPort; + } + public Integer runDeleteTime; public Integer getRunDeleteTime() { @@ -336,6 +348,18 @@ public Long getTimeBetweenErrorEvents() { return this.timeBetweenErrorEvents; + } + + public String TruststorePass; + + public String getTruststorePass() { + return this.TruststorePass; + } + + public String TruststoreUrl; + + public String getTruststoreUrl() { + return this.TruststoreUrl; } } @@ -773,6 +797,39 @@ } + public void tJDBCInput_1_error(Exception exception, String errorComponent, + final java.util.Map<String, Object> globalMap) + throws TalendException { + end_Hash.put("tJDBCInput_1", System.currentTimeMillis()); + + ((java.util.Map) threadLocal.get()).put("status", "failure"); + + tJDBCInput_1_onSubJobError(exception, errorComponent, globalMap); + + } + + public void tContextLoad_2_error(Exception exception, + String errorComponent, final java.util.Map<String, Object> globalMap) + throws TalendException { + end_Hash.put("tContextLoad_2", System.currentTimeMillis()); + + ((java.util.Map) threadLocal.get()).put("status", "failure"); + + tJDBCInput_1_onSubJobError(exception, errorComponent, globalMap); + + } + + public void tSetKeystore_1_error(Exception exception, + String errorComponent, final java.util.Map<String, Object> globalMap) + throws TalendException { + end_Hash.put("tSetKeystore_1", System.currentTimeMillis()); + + ((java.util.Map) threadLocal.get()).put("status", "failure"); + + tSetKeystore_1_onSubJobError(exception, errorComponent, globalMap); + + } + public void tWaitForFile_1_error(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException { @@ -1147,6 +1204,28 @@ } + public void tJDBCInput_1_onSubJobError(Exception exception, + String errorComponent, final java.util.Map<String, Object> globalMap) + throws TalendException { + + resumeUtil.addLog("SYSTEM_LOG", "NODE:" + errorComponent, "", Thread + .currentThread().getId() + + "", "FATAL", "", exception.getMessage(), ResumeUtil + .getExceptionStackTrace(exception), ""); + + } + + public void tSetKeystore_1_onSubJobError(Exception exception, + String errorComponent, final java.util.Map<String, Object> globalMap) + throws TalendException { + + resumeUtil.addLog("SYSTEM_LOG", "NODE:" + errorComponent, "", Thread + .currentThread().getId() + + "", "FATAL", "", exception.getMessage(), ResumeUtil + .getExceptionStackTrace(exception), ""); + + } + public void tWaitForFile_1_onSubJobError(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException { @@ -1342,13 +1421,6 @@ context.ovirtEngineDbPassword); parentContextMap_tRunJob_4.put("ovirtEngineDbUser", context.ovirtEngineDbUser); - parentContextMap_tRunJob_4.put("ovirtEnginePortalAddress", - context.ovirtEnginePortalAddress); - parentContextMap_tRunJob_4.put( - "ovirtEnginePortalConnectionProtocol", - context.ovirtEnginePortalConnectionProtocol); - parentContextMap_tRunJob_4.put("ovirtEnginePortalPort", - context.ovirtEnginePortalPort); parentContextMap_tRunJob_4.put( "ovirtEngineHistoryDbDriverClass", context.ovirtEngineHistoryDbDriverClass); @@ -1359,12 +1431,23 @@ context.ovirtEngineHistoryDbPassword); parentContextMap_tRunJob_4.put("ovirtEngineHistoryDbUser", context.ovirtEngineHistoryDbUser); + parentContextMap_tRunJob_4.put("ovirtEnginePortalAddress", + context.ovirtEnginePortalAddress); + parentContextMap_tRunJob_4.put( + "ovirtEnginePortalConnectionProtocol", + context.ovirtEnginePortalConnectionProtocol); + parentContextMap_tRunJob_4.put("ovirtEnginePortalPort", + context.ovirtEnginePortalPort); parentContextMap_tRunJob_4.put("runDeleteTime", context.runDeleteTime); parentContextMap_tRunJob_4.put("runInterleave", context.runInterleave); parentContextMap_tRunJob_4.put("timeBetweenErrorEvents", context.timeBetweenErrorEvents); + parentContextMap_tRunJob_4.put("TruststorePass", + context.TruststorePass); + parentContextMap_tRunJob_4.put("TruststoreUrl", + context.TruststoreUrl); Object obj_tRunJob_4 = null; @@ -3946,24 +4029,6 @@ } if (key_tContextLoad_1 != null - && "ovirtEnginePortalAddress" - .equals(key_tContextLoad_1)) { - context.ovirtEnginePortalAddress = value_tContextLoad_1; - } - - if (key_tContextLoad_1 != null - && "ovirtEnginePortalConnectionProtocol" - .equals(key_tContextLoad_1)) { - context.ovirtEnginePortalConnectionProtocol = value_tContextLoad_1; - } - - if (key_tContextLoad_1 != null - && "ovirtEnginePortalPort" - .equals(key_tContextLoad_1)) { - context.ovirtEnginePortalPort = value_tContextLoad_1; - } - - if (key_tContextLoad_1 != null && "ovirtEngineHistoryDbDriverClass" .equals(key_tContextLoad_1)) { context.ovirtEngineHistoryDbDriverClass = value_tContextLoad_1; @@ -3985,6 +4050,24 @@ && "ovirtEngineHistoryDbUser" .equals(key_tContextLoad_1)) { context.ovirtEngineHistoryDbUser = value_tContextLoad_1; + } + + if (key_tContextLoad_1 != null + && "ovirtEnginePortalAddress" + .equals(key_tContextLoad_1)) { + context.ovirtEnginePortalAddress = value_tContextLoad_1; + } + + if (key_tContextLoad_1 != null + && "ovirtEnginePortalConnectionProtocol" + .equals(key_tContextLoad_1)) { + context.ovirtEnginePortalConnectionProtocol = value_tContextLoad_1; + } + + if (key_tContextLoad_1 != null + && "ovirtEnginePortalPort" + .equals(key_tContextLoad_1)) { + context.ovirtEnginePortalPort = value_tContextLoad_1; } if (key_tContextLoad_1 != null @@ -4012,6 +4095,18 @@ context.timeBetweenErrorEvents = Long .parseLong(value_tContextLoad_1); + } + + if (key_tContextLoad_1 != null + && "TruststorePass" + .equals(key_tContextLoad_1)) { + context.TruststorePass = value_tContextLoad_1; + } + + if (key_tContextLoad_1 != null + && "TruststoreUrl" + .equals(key_tContextLoad_1)) { + context.TruststoreUrl = value_tContextLoad_1; } if (context.getProperty(key_tContextLoad_1) != null) { @@ -5395,6 +5490,8 @@ ok_Hash.put("tJDBCConnection_5", true); end_Hash.put("tJDBCConnection_5", System.currentTimeMillis()); + tJDBCInput_1Process(globalMap); + /** * [tJDBCConnection_5 end ] stop */ @@ -5412,6 +5509,649 @@ } globalMap.put("tJDBCConnection_5_SUBPROCESS_STATE", 1); + } + + public static class row4Struct implements + routines.system.IPersistableRow<row4Struct> { + final static byte[] commonByteArrayLock_OVIRT_ENGINE_DWH_HistoryETL = new byte[0]; + static byte[] commonByteArray_OVIRT_ENGINE_DWH_HistoryETL = new byte[0]; + + public String key; + + public String getKey() { + return this.key; + } + + public String value; + + public String getValue() { + return this.value; + } + + private String readString(ObjectInputStream dis) throws IOException { + String strReturn = null; + int length = 0; + length = dis.readInt(); + if (length == -1) { + strReturn = null; + } else { + if (length > commonByteArray_OVIRT_ENGINE_DWH_HistoryETL.length) { + if (length < 1024 + && commonByteArray_OVIRT_ENGINE_DWH_HistoryETL.length == 0) { + commonByteArray_OVIRT_ENGINE_DWH_HistoryETL = new byte[1024]; + } else { + commonByteArray_OVIRT_ENGINE_DWH_HistoryETL = new byte[2 * length]; + } + } + dis.readFully(commonByteArray_OVIRT_ENGINE_DWH_HistoryETL, 0, + length); + strReturn = new String( + commonByteArray_OVIRT_ENGINE_DWH_HistoryETL, 0, length, + utf8Charset); + } + return strReturn; + } + + private void writeString(String str, ObjectOutputStream dos) + throws IOException { + if (str == null) { + dos.writeInt(-1); + } else { + byte[] byteArray = str.getBytes(utf8Charset); + dos.writeInt(byteArray.length); + dos.write(byteArray); + } + } + + public void readData(ObjectInputStream dis) { + + synchronized (commonByteArrayLock_OVIRT_ENGINE_DWH_HistoryETL) { + + try { + + int length = 0; + + this.key = readString(dis); + + this.value = readString(dis); + + } catch (IOException e) { + throw new RuntimeException(e); + + } + + } + + } + + public void writeData(ObjectOutputStream dos) { + try { + + // String + + writeString(this.key, dos); + + // String + + writeString(this.value, dos); + + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append(super.toString()); + sb.append("["); + sb.append("key=" + key); + sb.append(",value=" + value); + sb.append("]"); + + return sb.toString(); + } + + /** + * Compare keys + */ + public int compareTo(row4Struct other) { + + int returnValue = -1; + + return returnValue; + } + + private int checkNullsAndCompare(Object object1, Object object2) { + int returnValue = 0; + if (object1 instanceof Comparable && object2 instanceof Comparable) { + returnValue = ((Comparable) object1).compareTo(object2); + } else if (object1 != null && object2 != null) { + returnValue = compareStrings(object1.toString(), object2 + .toString()); + } else if (object1 == null && object2 != null) { + returnValue = 1; + } else if (object1 != null && object2 == null) { + returnValue = -1; + } else { + returnValue = 0; + } + + return returnValue; + } + + private int compareStrings(String string1, String string2) { + return string1.compareTo(string2); + } + + } + + public void tJDBCInput_1Process( + final java.util.Map<String, Object> globalMap) + throws TalendException { + globalMap.put("tJDBCInput_1_SUBPROCESS_STATE", 0); + + final boolean execStat = this.execStat; + + String iterateId = ""; + String currentComponent = ""; + + try { + + String currentMethodName = new Exception().getStackTrace()[0] + .getMethodName(); + boolean resumeIt = currentMethodName.equals(resumeEntryMethodName); + if (resumeEntryMethodName == null || resumeIt || globalResumeTicket) {// start + // the + // resume + globalResumeTicket = true; + + row4Struct row4 = new row4Struct(); + + /** + * [tContextLoad_2 begin ] start + */ + + ok_Hash.put("tContextLoad_2", false); + start_Hash.put("tContextLoad_2", System.currentTimeMillis()); + currentComponent = "tContextLoad_2"; + + int tos_count_tContextLoad_2 = 0; + java.util.List<String> assignList_tContextLoad_2 = new java.util.ArrayList<String>(); + java.util.List<String> newPropertyList_tContextLoad_2 = new java.util.ArrayList<String>(); + java.util.List<String> noAssignList_tContextLoad_2 = new java.util.ArrayList<String>(); + int nb_line_tContextLoad_2 = 0; + + /** + * [tContextLoad_2 begin ] stop + */ + + /** + * [tJDBCInput_1 begin ] start + */ + + ok_Hash.put("tJDBCInput_1", false); + start_Hash.put("tJDBCInput_1", System.currentTimeMillis()); + currentComponent = "tJDBCInput_1"; + + int tos_count_tJDBCInput_1 = 0; + + int nb_line_tJDBCInput_1 = 0; + java.sql.Connection conn_tJDBCInput_1 = null; + conn_tJDBCInput_1 = (java.sql.Connection) globalMap + .get("conn_tJDBCConnection_6"); + + java.sql.Statement stmt_tJDBCInput_1 = conn_tJDBCInput_1 + .createStatement(); + + String dbquery_tJDBCInput_1 = "SELECT option_name, option_value FROM vdc_options WHERE option_name = 'TruststoreUrl' OR option_name = 'TruststorePass'"; + + globalMap.put("tJDBCInput_1_QUERY", dbquery_tJDBCInput_1); + + java.sql.ResultSet rs_tJDBCInput_1 = stmt_tJDBCInput_1 + .executeQuery(dbquery_tJDBCInput_1); + java.sql.ResultSetMetaData rsmd_tJDBCInput_1 = rs_tJDBCInput_1 + .getMetaData(); + int colQtyInRs_tJDBCInput_1 = rsmd_tJDBCInput_1 + .getColumnCount(); + + String tmpContent_tJDBCInput_1 = null; + while (rs_tJDBCInput_1.next()) { + nb_line_tJDBCInput_1++; + + if (colQtyInRs_tJDBCInput_1 < 1) { + row4.key = null; + } else { + + tmpContent_tJDBCInput_1 = rs_tJDBCInput_1.getString(1); + if (tmpContent_tJDBCInput_1 != null) { + row4.key = tmpContent_tJDBCInput_1; + } else { + row4.key = null; + } + + if (rs_tJDBCInput_1.wasNull()) { + row4.key = null; + } + } + if (colQtyInRs_tJDBCInput_1 < 2) { + row4.value = null; + } else { + + tmpContent_tJDBCInput_1 = rs_tJDBCInput_1.getString(2); + if (tmpContent_tJDBCInput_1 != null) { + row4.value = tmpContent_tJDBCInput_1; + } else { + row4.value = null; + } + + if (rs_tJDBCInput_1.wasNull()) { + row4.value = null; + } + } + + /** + * [tJDBCInput_1 begin ] stop + */ + /** + * [tJDBCInput_1 main ] start + */ + + currentComponent = "tJDBCInput_1"; + + tos_count_tJDBCInput_1++; + + /** + * [tJDBCInput_1 main ] stop + */ + + /** + * [tContextLoad_2 main ] start + */ + + currentComponent = "tContextLoad_2"; + + // //////////////////////// + String tmp_key_tContextLoad_2 = null; + + String key_tContextLoad_2 = null; + if (row4.key != null) { + tmp_key_tContextLoad_2 = row4.key.trim(); + if ((tmp_key_tContextLoad_2.startsWith("#") || tmp_key_tContextLoad_2 + .startsWith("!"))) { + tmp_key_tContextLoad_2 = null; + } else { + row4.key = tmp_key_tContextLoad_2; + } + } + if (row4.key != null) { + + key_tContextLoad_2 = + + row4.key; + + } + + String value_tContextLoad_2 = null; + if (row4.value != null) { + + value_tContextLoad_2 = + + row4.value; + + } + + if (tmp_key_tContextLoad_2 != null) { + try { + if (key_tContextLoad_2 != null + && "hoursToKeepDaily" + .equals(key_tContextLoad_2)) { + + context.hoursToKeepDaily = Integer + .parseInt(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "hoursToKeepHourly" + .equals(key_tContextLoad_2)) { + + context.hoursToKeepHourly = Integer + .parseInt(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "hoursToKeepSamples" + .equals(key_tContextLoad_2)) { + + context.hoursToKeepSamples = Integer + .parseInt(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "lastErrorSent" + .equals(key_tContextLoad_2)) { + String context_lastErrorSent_value = context + .getProperty("lastErrorSent"); + if (context_lastErrorSent_value == null) + context_lastErrorSent_value = ""; + int context_lastErrorSent_pos = context_lastErrorSent_value + .indexOf(";"); + String context_lastErrorSent_pattern = "yyyy-MM-dd HH:mm:ss"; + if (context_lastErrorSent_pos > -1) { + context_lastErrorSent_pattern = context_lastErrorSent_value + .substring(0, + context_lastErrorSent_pos); + } + context.lastErrorSent = (java.util.Date) (new java.text.SimpleDateFormat( + context_lastErrorSent_pattern) + .parse(value_tContextLoad_2)); + + } + + if (key_tContextLoad_2 != null + && "ovirtEngineDbDriverClass" + .equals(key_tContextLoad_2)) { + context.ovirtEngineDbDriverClass = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineDbJdbcConnection" + .equals(key_tContextLoad_2)) { + context.ovirtEngineDbJdbcConnection = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineDbPassword" + .equals(key_tContextLoad_2)) { + context.ovirtEngineDbPassword = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineDbUser" + .equals(key_tContextLoad_2)) { + context.ovirtEngineDbUser = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineHistoryDbDriverClass" + .equals(key_tContextLoad_2)) { + context.ovirtEngineHistoryDbDriverClass = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineHistoryDbJdbcConnection" + .equals(key_tContextLoad_2)) { + context.ovirtEngineHistoryDbJdbcConnection = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineHistoryDbPassword" + .equals(key_tContextLoad_2)) { + context.ovirtEngineHistoryDbPassword = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEngineHistoryDbUser" + .equals(key_tContextLoad_2)) { + context.ovirtEngineHistoryDbUser = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEnginePortalAddress" + .equals(key_tContextLoad_2)) { + context.ovirtEnginePortalAddress = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEnginePortalConnectionProtocol" + .equals(key_tContextLoad_2)) { + context.ovirtEnginePortalConnectionProtocol = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "ovirtEnginePortalPort" + .equals(key_tContextLoad_2)) { + context.ovirtEnginePortalPort = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "runDeleteTime" + .equals(key_tContextLoad_2)) { + + context.runDeleteTime = Integer + .parseInt(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "runInterleave" + .equals(key_tContextLoad_2)) { + + context.runInterleave = Integer + .parseInt(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "timeBetweenErrorEvents" + .equals(key_tContextLoad_2)) { + + context.timeBetweenErrorEvents = Long + .parseLong(value_tContextLoad_2); + + } + + if (key_tContextLoad_2 != null + && "TruststorePass" + .equals(key_tContextLoad_2)) { + context.TruststorePass = value_tContextLoad_2; + } + + if (key_tContextLoad_2 != null + && "TruststoreUrl" + .equals(key_tContextLoad_2)) { + context.TruststoreUrl = value_tContextLoad_2; + } + + if (context.getProperty(key_tContextLoad_2) != null) { + assignList_tContextLoad_2 + .add(key_tContextLoad_2); + } else { + newPropertyList_tContextLoad_2 + .add(key_tContextLoad_2); + } + context.setProperty(key_tContextLoad_2, + value_tContextLoad_2); + } catch (Exception e) { + System.err.println("Set value for key: " + + key_tContextLoad_2 + + " failed, error message: " + + e.getMessage()); + } + nb_line_tContextLoad_2++; + } + // //////////////////////// + + tos_count_tContextLoad_2++; + + /** + * [tContextLoad_2 main ] stop + */ + + /** + * [tJDBCInput_1 end ] start + */ + + currentComponent = "tJDBCInput_1"; + + } + stmt_tJDBCInput_1.close(); + + globalMap.put("tJDBCInput_1_NB_LINE", nb_line_tJDBCInput_1); + + ok_Hash.put("tJDBCInput_1", true); + end_Hash.put("tJDBCInput_1", System.currentTimeMillis()); + + /** + * [tJDBCInput_1 end ] stop + */ + + /** + * [tContextLoad_2 end ] start + */ + + currentComponent = "tContextLoad_2"; + + java.util.Enumeration<?> enu_tContextLoad_2 = context + .propertyNames(); + while (enu_tContextLoad_2.hasMoreElements()) { + String key_tContextLoad_2 = (String) enu_tContextLoad_2 + .nextElement(); + if (!assignList_tContextLoad_2.contains(key_tContextLoad_2) + && !newPropertyList_tContextLoad_2 + .contains(key_tContextLoad_2)) { + noAssignList_tContextLoad_2.add(key_tContextLoad_2); + } + } + + String newPropertyStr_tContextLoad_2 = newPropertyList_tContextLoad_2 + .toString(); + String newProperty_tContextLoad_2 = newPropertyStr_tContextLoad_2 + .substring(1, + newPropertyStr_tContextLoad_2.length() - 1); + + String noAssignStr_tContextLoad_2 = noAssignList_tContextLoad_2 + .toString(); + String noAssign_tContextLoad_2 = noAssignStr_tContextLoad_2 + .substring(1, noAssignStr_tContextLoad_2.length() - 1); + + globalMap.put("tContextLoad_2_KEY_NOT_INCONTEXT", + newProperty_tContextLoad_2); + globalMap.put("tContextLoad_2_KEY_NOT_LOADED", + noAssign_tContextLoad_2); + + globalMap.put("tContextLoad_2_NB_LINE", nb_line_tContextLoad_2); + + resumeUtil.addLog("NODE", "NODE:tContextLoad_2", "", Thread + .currentThread().getId() + + "", "", "", "", "", resumeUtil + .convertToJsonText(context)); + + ok_Hash.put("tContextLoad_2", true); + end_Hash.put("tContextLoad_2", System.currentTimeMillis()); + + /** + * [tContextLoad_2 end ] stop + */ + + }// end the resume + + if (resumeEntryMethodName == null || globalResumeTicket) { + resumeUtil + .addLog("CHECKPOINT", + "CONNECTION:SUBJOB_OK:tJDBCInput_1:OnSubjobOk", + "", Thread.currentThread().getId() + "", "", + "", "", "", ""); + } + + tSetKeystore_1Process(globalMap); + + } catch (Exception e) { + + throw new TalendException(e, currentComponent, globalMap); + + } catch (java.lang.Error error) { + + throw new java.lang.Error(error); + + } + + globalMap.put("tJDBCInput_1_SUBPROCESS_STATE", 1); + } + + public void tSetKeystore_1Process( + final java.util.Map<String, Object> globalMap) + throws TalendException { + globalMap.put("tSetKeystore_1_SUBPROCESS_STATE", 0); + + final boolean execStat = this.execStat; + + String iterateId = ""; + String currentComponent = ""; + + try { + + String currentMethodName = new Exception().getStackTrace()[0] + .getMethodName(); + boolean resumeIt = currentMethodName.equals(resumeEntryMethodName); + if (resumeEntryMethodName == null || resumeIt || globalResumeTicket) {// start + // the + // resume + globalResumeTicket = true; + + /** + * [tSetKeystore_1 begin ] start + */ + + ok_Hash.put("tSetKeystore_1", false); + start_Hash.put("tSetKeystore_1", System.currentTimeMillis()); + currentComponent = "tSetKeystore_1"; + + int tos_count_tSetKeystore_1 = 0; + + /** + * [tSetKeystore_1 begin ] stop + */ + /** + * [tSetKeystore_1 main ] start + */ + + currentComponent = "tSetKeystore_1"; + + System.setProperty("javax.net.ssl.trustStore", + context.TruststoreUrl); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); + System.setProperty("javax.net.ssl.trustStorePassword", + context.TruststorePass); + System.clearProperty("javax.net.ssl.keyStore"); + System.clearProperty("javax.net.ssl.keyStoreType"); + System.clearProperty("javax.net.ssl.keyStorePassword"); + + tos_count_tSetKeystore_1++; + + /** + * [tSetKeystore_1 main ] stop + */ + /** + * [tSetKeystore_1 end ] start + */ + + currentComponent = "tSetKeystore_1"; + + ok_Hash.put("tSetKeystore_1", true); + end_Hash.put("tSetKeystore_1", System.currentTimeMillis()); + + /** + * [tSetKeystore_1 end ] stop + */ + + }// end the resume + + } catch (Exception e) { + + throw new TalendException(e, currentComponent, globalMap); + + } catch (java.lang.Error error) { + + throw new java.lang.Error(error); + + } + + globalMap.put("tSetKeystore_1_SUBPROCESS_STATE", 1); } public void tWaitForFile_1Process( @@ -5760,13 +6500,6 @@ context.ovirtEngineDbPassword); parentContextMap_tRunJob_2.put("ovirtEngineDbUser", context.ovirtEngineDbUser); - parentContextMap_tRunJob_2.put("ovirtEnginePortalAddress", - context.ovirtEnginePortalAddress); - parentContextMap_tRunJob_2.put( - "ovirtEnginePortalConnectionProtocol", - context.ovirtEnginePortalConnectionProtocol); - parentContextMap_tRunJob_2.put("ovirtEnginePortalPort", - context.ovirtEnginePortalPort); parentContextMap_tRunJob_2.put( "ovirtEngineHistoryDbDriverClass", context.ovirtEngineHistoryDbDriverClass); @@ -5777,12 +6510,23 @@ context.ovirtEngineHistoryDbPassword); parentContextMap_tRunJob_2.put("ovirtEngineHistoryDbUser", context.ovirtEngineHistoryDbUser); + parentContextMap_tRunJob_2.put("ovirtEnginePortalAddress", + context.ovirtEnginePortalAddress); + parentContextMap_tRunJob_2.put( + "ovirtEnginePortalConnectionProtocol", + context.ovirtEnginePortalConnectionProtocol); + parentContextMap_tRunJob_2.put("ovirtEnginePortalPort", + context.ovirtEnginePortalPort); parentContextMap_tRunJob_2.put("runDeleteTime", context.runDeleteTime); parentContextMap_tRunJob_2.put("runInterleave", context.runInterleave); parentContextMap_tRunJob_2.put("timeBetweenErrorEvents", context.timeBetweenErrorEvents); + parentContextMap_tRunJob_2.put("TruststorePass", + context.TruststorePass); + parentContextMap_tRunJob_2.put("TruststoreUrl", + context.TruststoreUrl); Object obj_tRunJob_2 = null; @@ -7845,15 +8589,6 @@ context.ovirtEngineDbUser = (String) context .getProperty("ovirtEngineDbUser"); - context.ovirtEnginePortalAddress = (String) context - .getProperty("ovirtEnginePortalAddress"); - - context.ovirtEnginePortalConnectionProtocol = (String) context - .getProperty("ovirtEnginePortalConnectionProtocol"); - - context.ovirtEnginePortalPort = (String) context - .getProperty("ovirtEnginePortalPort"); - context.ovirtEngineHistoryDbDriverClass = (String) context .getProperty("ovirtEngineHistoryDbDriverClass"); @@ -7865,6 +8600,15 @@ context.ovirtEngineHistoryDbUser = (String) context .getProperty("ovirtEngineHistoryDbUser"); + + context.ovirtEnginePortalAddress = (String) context + .getProperty("ovirtEnginePortalAddress"); + + context.ovirtEnginePortalConnectionProtocol = (String) context + .getProperty("ovirtEnginePortalConnectionProtocol"); + + context.ovirtEnginePortalPort = (String) context + .getProperty("ovirtEnginePortalPort"); try { context.runDeleteTime = routines.system.ParserUtils @@ -7887,6 +8631,12 @@ } catch (NumberFormatException e) { context.timeBetweenErrorEvents = null; } + + context.TruststorePass = (String) context + .getProperty("TruststorePass"); + + context.TruststoreUrl = (String) context + .getProperty("TruststoreUrl"); } catch (java.io.IOException ie) { System.err.println("Could not load context " + contextStr); @@ -7927,19 +8677,6 @@ context.ovirtEngineDbUser = (String) parentContextMap .get("ovirtEngineDbUser"); } - if (parentContextMap.containsKey("ovirtEnginePortalAddress")) { - context.ovirtEnginePortalAddress = (String) parentContextMap - .get("ovirtEnginePortalAddress"); - } - if (parentContextMap - .containsKey("ovirtEnginePortalConnectionProtocol")) { - context.ovirtEnginePortalConnectionProtocol = (String) parentContextMap - .get("ovirtEnginePortalConnectionProtocol"); - } - if (parentContextMap.containsKey("ovirtEnginePortalPort")) { - context.ovirtEnginePortalPort = (String) parentContextMap - .get("ovirtEnginePortalPort"); - } if (parentContextMap.containsKey("ovirtEngineHistoryDbDriverClass")) { context.ovirtEngineHistoryDbDriverClass = (String) parentContextMap .get("ovirtEngineHistoryDbDriverClass"); @@ -7957,6 +8694,19 @@ context.ovirtEngineHistoryDbUser = (String) parentContextMap .get("ovirtEngineHistoryDbUser"); } + if (parentContextMap.containsKey("ovirtEnginePortalAddress")) { + context.ovirtEnginePortalAddress = (String) parentContextMap + .get("ovirtEnginePortalAddress"); + } + if (parentContextMap + .containsKey("ovirtEnginePortalConnectionProtocol")) { + context.ovirtEnginePortalConnectionProtocol = (String) parentContextMap + .get("ovirtEnginePortalConnectionProtocol"); + } + if (parentContextMap.containsKey("ovirtEnginePortalPort")) { + context.ovirtEnginePortalPort = (String) parentContextMap + .get("ovirtEnginePortalPort"); + } if (parentContextMap.containsKey("runDeleteTime")) { context.runDeleteTime = (Integer) parentContextMap .get("runDeleteTime"); @@ -7968,6 +8718,14 @@ if (parentContextMap.containsKey("timeBetweenErrorEvents")) { context.timeBetweenErrorEvents = (Long) parentContextMap .get("timeBetweenErrorEvents"); + } + if (parentContextMap.containsKey("TruststorePass")) { + context.TruststorePass = (String) parentContextMap + .get("TruststorePass"); + } + if (parentContextMap.containsKey("TruststoreUrl")) { + context.TruststoreUrl = (String) parentContextMap + .get("TruststoreUrl"); } } @@ -8297,6 +9055,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 215243 characters generated by Talend Open Studio for Data Integration on the - * February 6, 2013 2:16:30 PM IST + * 236385 characters generated by Talend Open Studio for Data Integration on the + * March 4, 2013 3:20:47 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.item b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.item index e9ba470..5de7e1f 100644 --- a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.item +++ b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.item @@ -22,4 +22,6 @@ <contextParameter comment="" name="lastErrorSent" prompt="lastErrorSent?" promptNeeded="true" type="id_Date" value="yyyy-MM-dd HH:mm:ss.SSSSSS;2011-07-03 12:46:47.000000"/> <contextParameter comment="Enter the amout of to wait between sending error events to audit log" name="timeBetweenErrorEvents" prompt="timeBetweenErrorEvents?" promptNeeded="true" type="id_Long" value="300000"/> <contextParameter comment="" name="timesFailed" prompt="timesFailed?" promptNeeded="false" type="id_Integer" value="0"/> + <contextParameter comment="" name="TruststoreUrl" prompt="TruststoreUrl?" promptNeeded="false" type="id_String" value="/etc/pki/ovirt-engine/.keystore"/> + <contextParameter comment="" name="TruststorePass" prompt="TruststorePass?" promptNeeded="false" type="id_String" value="mypass"/> </talendfile:ContextType> diff --git a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.properties b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.properties index 8d4d5c5..877f3ea 100644 --- a/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.properties +++ b/data-warehouse/history_etl/tos_project/context/connectionJDBC_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_3OYyMEP_EeC5PvJxFZIIsw" id="_3OYLIEP_EeC5PvJxFZIIsw" label="connectionJDBC" creationDate="2011-07-07T16:32:38.822+0300" modificationDate="2013-02-06T12:53:48.493+0200" version="3.2" statusCode="" item="_3OYyMkP_EeC5PvJxFZIIsw" displayName="connectionJDBC"> + <TalendProperties:Property xmi:id="_3OYyMEP_EeC5PvJxFZIIsw" id="_3OYLIEP_EeC5PvJxFZIIsw" label="connectionJDBC" creationDate="2011-07-07T16:32:38.822+0300" modificationDate="2013-03-04T12:39:56.693+0200" version="3.2" statusCode="" item="_3OYyMkP_EeC5PvJxFZIIsw" displayName="connectionJDBC"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_3OYyMUP_EeC5PvJxFZIIsw" path=""/> diff --git a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.item b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.item index 81d01cb..04fd496 100644 --- a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.item @@ -9,16 +9,18 @@ <contextParameter comment="Enter the ovirt JDBC connection URL." name="ovirtEngineDbJdbcConnection" prompt="Enter the ovirt JDBC connection URL." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="jdbc:postgresql://localhost:5432/engine?stringtype=unspecified"/> <contextParameter comment="Enter the ovirt admin user's password." name="ovirtEngineDbPassword" prompt="Enter the ovirt admin user's password." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Password" value=""/> <contextParameter comment="Enter the ovirt admin database user." name="ovirtEngineDbUser" prompt="Enter the ovirt admin database user." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="postgres"/> - <contextParameter comment="Enter the oVirt Engine Portal address." name="ovirtEnginePortalAddress" prompt="ovirtEnginePortalAddress?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="localhost"/> - <contextParameter comment="Enter the oVirt Engine Portal connection protocol." name="ovirtEnginePortalConnectionProtocol" prompt="ovirtEnginePortalConnectionProtocol?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="http"/> - <contextParameter comment="Enter the oVirt Engine Portal port." name="ovirtEnginePortalPort" prompt="ovirtEnginePortalPort?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="8080"/> <contextParameter comment="Enter the JDBC driver class for the ovirt engine history database." name="ovirtEngineHistoryDbDriverClass" prompt="Enter the JDBC driver class for the ovirt engine history database." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="org.postgresql.Driver"/> <contextParameter comment="Enter the ovirt engine history JDBC connection URL." name="ovirtEngineHistoryDbJdbcConnection" prompt="Enter the ovirt engine history JDBC connection URL." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="jdbc:postgresql://localhost:5432/ovirt_engine_history?stringtype=unspecified"/> <contextParameter comment="Enter the ovirt engine history admin user's password." name="ovirtEngineHistoryDbPassword" prompt="Enter the ovirt engine history admin user's password." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Password" value=""/> <contextParameter comment="Enter the ovirt engine history admin database user." name="ovirtEngineHistoryDbUser" prompt="Enter the ovirt engine history admin database user." promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="postgres"/> + <contextParameter comment="Enter the oVirt Engine Portal address." name="ovirtEnginePortalAddress" prompt="ovirtEnginePortalAddress?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="localhost"/> + <contextParameter comment="Enter the oVirt Engine Portal connection protocol." name="ovirtEnginePortalConnectionProtocol" prompt="ovirtEnginePortalConnectionProtocol?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="http"/> + <contextParameter comment="Enter the oVirt Engine Portal port." name="ovirtEnginePortalPort" prompt="ovirtEnginePortalPort?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="8080"/> <contextParameter comment="Enter the time to run the delete job. Can only run on round hour 24 hours clock." name="runDeleteTime" prompt="runDeleteTime?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Integer" value="3"/> <contextParameter comment="Enter the run interleave in seconds" name="runInterleave" prompt="Enter the run interleave in seconds?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Integer" value="60"/> <contextParameter comment="Enter the amout of to wait between sending error events to audit log" name="timeBetweenErrorEvents" prompt="timeBetweenErrorEvents?" promptNeeded="true" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_Long" value="300000"/> + <contextParameter comment="" name="TruststorePass" prompt="TruststorePass?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="mypass"/> + <contextParameter comment="" name="TruststoreUrl" prompt="TruststoreUrl?" promptNeeded="false" repositoryContextId="_3OYLIEP_EeC5PvJxFZIIsw" type="id_String" value="/etc/pki/ovirt-engine/.keystore"/> </context> <parameters> <elementParameter field="TEXT" name="JOB_RUN_VM_ARGUMENTS" value=" -Xms256M -Xmx1024M"/> @@ -925,6 +927,74 @@ <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> <metadata connector="FLOW" name="tJava_4"/> </node> + <node componentName="tSetKeystore" componentVersion="0.102" offsetLabelX="0" offsetLabelY="0" posX="1760" posY="0"> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="tSetKeystore_1"/> + <elementParameter field="CLOSED_LIST" name="TRUSTSTORE_TYPE" value="PKCS12"/> + <elementParameter field="FILE" name="SSL_TRUSTSERVER_TRUSTSTORE" value="context.TruststoreUrl"/> + <elementParameter field="TEXT" name="SSL_TRUSTSERVER_PASSWORD" value="context.TruststorePass"/> + <elementParameter field="CHECK" name="NEED_CLIENT_AUTH" value="false"/> + <elementParameter field="CLOSED_LIST" name="KEYSTORE_TYPE" value="JKS"/> + <elementParameter field="FILE" name="SSL_KEYSTORE" value=""C::/client.keystore""/> + <elementParameter field="TEXT" name="SSL_KEYSTORE_PASSWORD" value=""password""/> + <elementParameter field="CHECK" name="VERIFY_NAME" value="true"/> + <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/> + <elementParameter field="CHECK" name="INFORMATION" value="false"/> + <elementParameter field="MEMO" name="COMMENT" value=""/> + <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> + </node> + <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" offsetLabelY="0" posX="1632" posY="0"> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_1"/> + <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" value="true"/> + <elementParameter field="COMPONENT_LIST" name="CONNECTION" value="tJDBCConnection_6"/> + <elementParameter field="TEXT" name="URL" value=""jdbc:""/> + <elementParameter field="TABLE" name="DRIVER_JAR"/> + <elementParameter field="TEXT" name="DRIVER_CLASS" value=""""/> + <elementParameter field="TEXT" name="USER" value=""""/> + <elementParameter field="TEXT" name="PASS" value=""""/> + <elementParameter field="DBTABLE" name="TABLE" value=""vdc_options""/> + <elementParameter field="QUERYSTORE_TYPE" name="QUERYSTORE" value=""""/> + <elementParameter field="TECHNICAL" name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/> + <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" value="BUILT_IN"/> + <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" value=""""/> + <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT option_name, option_value
 FROM vdc_options
 WHERE option_name = 'TruststoreUrl' OR
 option_name = 'TruststorePass'""/> + <elementParameter field="ENCODING_TYPE" name="ENCODING" value=""ISO-8859-15""/> + <elementParameter field="TECHNICAL" name="ENCODING:ENCODING_TYPE" value="ISO-8859-15"/> + <elementParameter field="CHECK" name="USE_CURSOR" value="false"/> + <elementParameter field="TEXT" name="CURSOR_SIZE" value="1000"/> + <elementParameter field="CHECK" name="TRIM_ALL_COLUMN" value="false"/> + <elementParameter field="TABLE" name="TRIM_COLUMN"> + <elementValue elementRef="SCHEMA_COLUMN" value="key"/> + <elementValue elementRef="TRIM" value="false"/> + <elementValue elementRef="SCHEMA_COLUMN" value="value"/> + <elementValue elementRef="TRIM" value="false"/> + </elementParameter> + <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/> + <elementParameter field="CHECK" name="INFORMATION" value="false"/> + <elementParameter field="MEMO" name="COMMENT" value=""/> + <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> + <metadata connector="FLOW" name="tJDBCInput_1"> + <column comment="" key="false" name="key" nullable="true" pattern="" sourceType="" type="id_String"/> + <column comment="" key="false" name="value" nullable="true" pattern="" sourceType="" type="id_String"/> + </metadata> + </node> + <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" offsetLabelY="0" posX="1632" posY="96"> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_2"/> + <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" value="Warning"/> + <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" value="Warning"/> + <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/> + <elementParameter field="CHECK" name="DISABLE_ERROR" value="false"/> + <elementParameter field="CHECK" name="DISABLE_WARNINGS" value="true"/> + <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/> + <elementParameter field="CHECK" name="DIEONERROR" value="false"/> + <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/> + <elementParameter field="CHECK" name="INFORMATION" value="false"/> + <elementParameter field="MEMO" name="COMMENT" value=""/> + <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> + <metadata connector="FLOW" name="tContextLoad_2"> + <column defaultValue="" key="false" length="255" name="key" nullable="true" precision="0" sourceType="" type="id_String"/> + <column defaultValue="" key="false" length="255" name="value" nullable="true" precision="0" sourceType="" type="id_String"/> + </metadata> + </node> <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" metaname="tJDBCConnection_1" offsetLabelX="0" offsetLabelY="0" source="tJDBCConnection_1" target="tJDBCConnection_3"> <elementParameter field="CHECK" name="ACTIVATE" value="true"/> <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk2"/> @@ -940,6 +1010,10 @@ <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" metaname="tJDBCConnection_4" offsetLabelX="0" offsetLabelY="0" source="tJDBCConnection_4" target="tJDBCConnection_5"> <elementParameter field="CHECK" name="ACTIVATE" value="true"/> <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk4"/> + </connection> + <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" metaname="tJDBCConnection_5" offsetLabelX="0" offsetLabelY="0" source="tJDBCConnection_5" target="tJDBCInput_1"> + <elementParameter field="CHECK" name="ACTIVATE" value="true"/> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk8"/> </connection> <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" metaname="tPostjob_1" offsetLabelX="0" offsetLabelY="0" source="tPostjob_1" target="tJDBCRollback_1"> <elementParameter field="CHECK" name="ACTIVATE" value="true"/> @@ -1406,6 +1480,32 @@ <elementParameter field="CHECK" name="ACTIVATE" value="true"/> <elementParameter field="TEXT" name="UNIQUE_NAME" value="event_output"/> </connection> + <connection connectorName="FLOW" label="row4" lineStyle="0" metaname="tJDBCInput_1" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_1" target="tContextLoad_2"> + <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" value="true"/> + <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER"> + <elementValue elementRef="TRACE_COLUMN" value="kty"/> + <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> + <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> + <elementValue elementRef="TRACE_COLUMN" value="value"/> + <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> + <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> + <elementValue elementRef="TRACE_COLUMN" value="key"/> + <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> + <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> + </elementParameter> + <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/> + <elementParameter field="CHECK" name="USEROWLABEL" value="true"/> + <elementParameter field="TEXT" name="METTERLABEL" value=""MyLabel""/> + <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/> + <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/> + <elementParameter field="TABLE" name="THRESHLODS"/> + <elementParameter field="CHECK" name="ACTIVATE" value="true"/> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="row4"/> + </connection> + <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" metaname="tJDBCInput_1" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_1" target="tSetKeystore_1"> + <elementParameter field="CHECK" name="ACTIVATE" value="true"/> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk13"/> + </connection> <subjob> <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCConnection_1"/> <elementParameter field="COLOR" name="SUBJOB_TITLE_COLOR" value="160;190;240"/> @@ -1548,4 +1648,14 @@ <elementParameter field="COLOR" name="SUBJOB_TITLE_COLOR" value="160;190;240"/> <elementParameter field="COLOR" name="SUBJOB_COLOR" value="220;220;250"/> </subjob> + <subjob> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="tSetKeystore_1"/> + <elementParameter field="COLOR" name="SUBJOB_TITLE_COLOR" value="160;190;240"/> + <elementParameter field="COLOR" name="SUBJOB_COLOR" value="220;220;250"/> + </subjob> + <subjob> + <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_1"/> + <elementParameter field="COLOR" name="SUBJOB_TITLE_COLOR" value="160;190;240"/> + <elementParameter field="COLOR" name="SUBJOB_COLOR" value="220;220;250"/> + </subjob> </talendfile:ProcessType> diff --git a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.properties b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.properties index 8c0b721..328ef31 100644 --- a/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/HistoryETL_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_SHvzYLt3EeCeWLgt9FiAVg" id="_SHJWcLt3EeCeWLgt9FiAVg" label="HistoryETL" creationDate="2011-07-31T16:22:19.809+0300" modificationDate="2013-02-06T13:37:15.284+0200" version="3.2" statusCode="" item="_SHvzYrt3EeCeWLgt9FiAVg" displayName="HistoryETL"> + <TalendProperties:Property xmi:id="_SHvzYLt3EeCeWLgt9FiAVg" id="_SHJWcLt3EeCeWLgt9FiAVg" label="HistoryETL" creationDate="2011-07-31T16:22:19.809+0300" modificationDate="2013-03-04T15:19:06.739+0200" version="3.2" statusCode="" item="_SHvzYrt3EeCeWLgt9FiAVg" displayName="HistoryETL"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_SHvzYbt3EeCeWLgt9FiAVg" path=""/> diff --git a/packaging/ovirt-engine-dwh-setup.py b/packaging/ovirt-engine-dwh-setup.py index 0642bdc..0640455 100755 --- a/packaging/ovirt-engine-dwh-setup.py +++ b/packaging/ovirt-engine-dwh-setup.py @@ -134,16 +134,6 @@ file_handler.editParam("ovirtEnginePortalPort", port) file_handler.close() - # Updating run properties - handler = utils.TextConfigFileHandler("/usr/share/ovirt-engine-dwh/etl/history_service.sh") - handler.open() - properties = handler.getParam("RUN_PROPERTIES") - if properties and "trustStore" not in properties: - newlist = properties.replace('"', '') - newlist = '"' + newlist + ' -Djavax.net.ssl.trustStore=' + utils.getVDCOption("TruststoreUrl") + ' -Djavax.net.ssl.trustStorePassword=' + utils.getVDCOption("TruststorePass") + '"' - handler.editParam("RUN_PROPERTIES", newlist) - handler.close() - def getHostParams(secure=True): """ get protocol, hostname & secured port from /etc/ovirt-engine/engine.conf -- To view, visit http://gerrit.ovirt.org/12681 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae5aeb4dd4a29fdf76551b23ebd077c594b6f60e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
