Merged PR 12080: added support for new OI dev servers

added support for new OI dev servers
This commit is contained in:
Stieber Daniel (CSC FI SPS MESLEO) 2025-03-05 00:21:41 +01:00
parent 36f16bf951
commit 018322a2b3
5 changed files with 47 additions and 52 deletions

View File

@ -582,12 +582,14 @@ End Service
//----------------------------------------------------------------------------------------------------------------------
Service SetupDevServices()
DevAppServices = ''
DevServerName = Environment_Services('GetServer')
IsProd = Environment_Services('IsProd')
If (IsProd EQ False$) then
DevDBServices = 'Update Material Logs':@VM:'Log Transaction Postings':@VM:'Process Wafer Image Queue':@VM
DevDBServices := 'Process UCL Requests':@VM:'Process ROTR Requests':@VM:'Process Wafer Image Requests':@VM
DevDBServices := 'Process SQL Requests':@VM:'Send Notes':@VM:'Update Notification Groups':@VM
DevDBServices := 'Update Security Groups':@VM:'Auto Scheduler'
BaselineServices = 'Update Material Logs':@VM:'Log Transaction Postings':@VM:'Process Wafer Image Queue':@VM
BaselineServices := 'Process UCL Requests':@VM:'Process ROTR Requests':@VM:'Process Wafer Image Requests':@VM
BaselineServices := 'Process SQL Requests':@VM:'Send Notes':@VM:'Update Notification Groups':@VM
BaselineServices := 'Update Security Groups':@VM:'Auto Scheduler'
Query = "SELECT SERVICES"
@ -600,33 +602,16 @@ Service SetupDevServices()
Loop
ReadNext ServiceName else EOF = True$
ServiceRec = Database_Services('ReadDataRow', 'SERVICES', ServiceName)
Server = ServiceRec<SERVICES.SERVER$>
Begin Case
Case ( (Server _EQC 'MESSA005') or (Server _EQC 'MESSA012') )
// App Servers
Locate ServiceName in DevAppServices using @VM setting vPos then
ServiceRec<SERVICES.SERVER$> = 'MESSA012'
ServiceRec<SERVICES.ACTIVE$> = True$
end else
ServiceRec<SERVICES.SERVER$> = 'MESSA012'
ServiceRec<SERVICES.ACTIVE$> = False$
end
Case ( (Server _EQC 'MESSA01EC') or (Server _EQC 'MESTSA01EC') )
// DB Servers
Locate ServiceName in DevDBServices using @VM setting vPos then
ServiceRec<SERVICES.SERVER$> = 'MESTSA01EC'
ServiceRec<SERVICES.ACTIVE$> = True$
end else
ServiceRec<SERVICES.SERVER$> = 'MESTSA01EC'
ServiceRec<SERVICES.ACTIVE$> = False$
end
End Case
If Error_Services('NoError') then
ServiceRec<SERVICES.SERVER$> = DevServerName
ServiceRec<SERVICES.ACTIVE$> = InList(BaselineServices, ServiceName, @VM)
Database_Services('WriteDataRow', 'SERVICES', ServiceName, ServiceRec, True$, False$, True$)
end
Until EOF
Repeat
end
end
end
end service
@ -657,3 +642,4 @@ ClearCursors:
Next counter
return

View File

@ -80,12 +80,14 @@ Service GetServer()
end service
Service IsProd()
Machine = Environment_Services('GetServer')
IsProd = False$
If Machine _NEC "messa012" and Machine _NEC "mestsa01ec" and Machine _NEC "MESTST1010" and Machine _NEC "MESTST1009" then
If Machine _NEC "messa012" and Machine _NEC "mestsa01ec" and Machine _NEC "mestsa09ec" and Machine _NEC "mestsa010ec" and Machine _NEC "mestsa011ec" and Machine _NEC "mestsa012ec" and Machine _NEC "MESTST1010" and Machine _NEC "MESTST1009" then
IsProd = True$
end
Response = IsProd
end service
@ -116,6 +118,10 @@ Service GetApplicationRootIP()
Begin Case
Case Machine EQ 'MESSA005' ; ApplicationRootIP = '\\messa005.infineon.com'
Case Machine EQ 'MESTSA01EC' ; ApplicationRootIP = '\\10.95.140.13'
Case Machine EQ 'MESTSA09EC' ; ApplicationRootIP = '\\10.95.140.62'
Case Machine EQ 'MESTSA010EC' ; ApplicationRootIP = '\\10.95.140.63'
Case Machine EQ 'MESTSA011EC' ; ApplicationRootIP = '\\10.95.140.64'
Case Machine EQ 'MESTSA012EC' ; ApplicationRootIP = '\\10.95.140.65'
Case Machine EQ 'MESSA012' ; ApplicationRootIP = '\\10.95.176.50'
Case Machine EQ 'MESST5201' ; ApplicationRootIP = '\\10.95.140.14'
Case Machine EQ 'MESST5202' ; ApplicationRootIP = '\\10.95.140.14'
@ -314,6 +320,10 @@ Service GetLocalRootPath()
Case Machine EQ 'MESSA012' ; LocalRootPath = 'D:'
Case Machine EQ 'MESSA01EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESTSA01EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESTSA09EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESTSA010EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESTSA011EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESTSA012EC' ; LocalRootPath = 'D:'
Case Machine EQ 'MESST6501' ; LocalRootPath = 'C:' ; // This is a map to the user's actual C drive.
Case Machine EQ 'MESST6502' ; LocalRootPath = 'C:' ; // This is a map to the user's actual C drive.
Case Machine EQ 'MESTST1006' ; LocalRootPath = 'C:' ; // This is a map to the user's actual C drive.
@ -448,7 +458,7 @@ Service GetSQLScrapeConnectionString()
Case Machine = 'MESSA01EC'
// PROD SQL Servers
ConnectionString = 'Provider=MSOLEDBSQL.1;Password=0okm9ijn;Persist Security Info=True;User ID=srpadmin;Initial Catalog=LSL2SQL;Data Source=MESSQLEC1.infineon.com\PROD1,53959;Initial File Name="";Trust Server Certificate=True;Server SPN="";Authentication="";Access Token=""'
Case Machine = 'MESTSA01EC'
Case ( (Machine = 'MESTSA01EC') or (Machine = 'MESTSA09EC') or (Machine = 'MESTSA010EC') or (Machine = 'MESTSA011EC') or (Machine = 'MESTSA012EC') )
// DEV SQL Servers
ConnectionString = 'Provider=MSOLEDBSQL.1;Password=Fisql2023!;Persist Security Info=True;User ID=fisql;Initial Catalog=LSL2SQL;Data Source=10.95.140.27\TEST1,50572;Initial File Name="";Trust Server Certificate=True;Server SPN="";Authentication="";Access Token=""'
Case Otherwise$
@ -531,6 +541,3 @@ end service
// Internal GoSubs
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

View File

@ -178,7 +178,7 @@ Service GetAllZebraPrinters()
ZebraPrinterList<7> = 'MESZBRPRT008' : @VM : '10.95.164.24' : @VM : 9100
ZebraPrinterList<8> = 'MESZBRPRT0011' : @VM : '10.95.15.33' : @VM : 6101
ZebraPrinterList<9> = 'FI_ZEBRA_PRINTER' : @VM : '10.95.164.55' : @VM : 9100
If Server EQ 'MESTSA01EC' OR Server EQ 'MESSA01EC' then
If Server EQ 'MESTSA01EC' OR Server EQ 'MESSA01EC' or Server EQ 'MESTSA09EC' or Server EQ 'MESTSA010EC' or Server EQ 'MESTSA011EC' or Server EQ 'MESTSA012EC' then
ZebraPrinterList<10> = 'JONATHAN_HOME_TEST' : @VM : '192.168.0.123' : @VM : 9100
end
@ -255,3 +255,4 @@ end service

View File

@ -115,7 +115,7 @@ Event WINDOW.CREATE(CreateParam)
OIX = (MajorVersion GE 10)
Begin Case
Case Server EQ 'MESSA005' or Server EQ 'MESSA012' or Server EQ 'MESSA01EC' or Server EQ 'MESTSA01EC'
Case Server EQ 'MESSA005' or Server EQ 'MESSA012' or Server EQ 'MESSA01EC' or Server EQ 'MESTSA01EC' or Server EQ 'MESTSA09EC' or Server EQ 'MESTSA010EC' or Server EQ 'MESTSA011EC' or Server EQ 'MESTSA012EC'
If OIX then
OCXDir = Drive():'\SRPControls64.ocx'
end else
@ -265,3 +265,4 @@ Setup_OLE_Controls:
return

View File

@ -24,7 +24,7 @@ Service Run()
Server = Environment_Services('GetServer')
Env = ''
Begin Case
Case Server EQ 'MESTSA01EC' OR Server EQ 'MESSA01EC'
Case Server EQ 'MESTSA01EC' or Server EQ 'MESSA01EC' or Server EQ 'MESTSA09EC' or Server EQ 'MESTSA010EC' or Server EQ 'MESTSA011EC' or Server EQ 'MESTSA012EC'
Env = 'DB'
Case Server EQ 'MESSA005' OR Server EQ 'MESSA012'
Env = 'APP'