Skip to content

Commit 825a979

Browse files
committed
registry condition
1 parent d23daf9 commit 825a979

File tree

2 files changed

+45
-4
lines changed

2 files changed

+45
-4
lines changed

tir/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,10 +1511,10 @@ def StopSchedule(self):
15111511
return self.__webapp.set_schedule(schedule_status=False)
15121512

15131513

1514-
def SetRouteMock(self, c_route, c_sub_route="", l_registry=False):
1514+
def SetRouteMock(self, route, sub_route="", registry=False):
15151515
"""Set up mock server ip on appserver.ini file
15161516
"""
1517-
self.__webapp.set_mock_route(c_route, c_sub_route=c_sub_route, l_registry=l_registry)
1517+
self.__webapp.set_mock_route(route, sub_route=sub_route, registry=registry)
15181518

15191519

15201520
def GetRouteMock(self):

tir/technologies/webapp_internal.py

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import socket
1212
import pathlib
1313
import sys
14+
import configparser
1415
import tir.technologies.core.enumerations as enum
1516
from functools import reduce
1617
from selenium.webdriver.common.keys import Keys
@@ -122,6 +123,9 @@ def __init__(self, config_path="", autostart=True):
122123
self.restart_tss = False
123124
self.last_wa_tab_view_input_id = None
124125
self.mock_route = ''
126+
self.registry_endpoint = ''
127+
self.rac_endpoint = ''
128+
self.platform_endpoint = ''
125129

126130
if not Base.driver:
127131
Base.driver = self.driver
@@ -11356,12 +11360,49 @@ def query_execute(self, query, database_driver, dbq_oracle_server, database_serv
1135611360
self.log_error(f"Error in query_execute: {str(e)}")
1135711361

1135811362

11359-
def set_mock_route(self, c_route, c_sub_route, l_registry):
11363+
def set_mock_route(self, route, sub_route, registry):
1136011364
"""Set up mock server ip on appserver.ini file
1136111365
"""
11362-
self.mock_route = c_route + c_sub_route
11366+
self.mock_route = route + sub_route
1136311367
logger().info(f'"{self.mock_route}" route Was seted')
1136411368

11369+
if registry:
11370+
11371+
if self.config.appserver_folder:
11372+
11373+
config = configparser.ConfigParser()
11374+
appserver_file = self.replace_slash(f'{self.config.appserver_folder}\\appserver.ini')
11375+
11376+
config.read(appserver_file)
11377+
11378+
if config.has_section(self.config.environment):
11379+
11380+
registry_endpoints = {
11381+
"fw-tf-registry-endpoint": f"{self.get_route_mock()}/registry",
11382+
"fw-tf-rac-endpoint": f"{self.get_route_mock()}",
11383+
"fw-tf-platform-endpoint": f"{self.get_route_mock()}",
11384+
}
11385+
11386+
for key, value in registry_endpoints.items():
11387+
if config.has_option(self.config.environment, key):
11388+
if key == "fw-tf-registry-endpoint" and not self.registry_endpoint:
11389+
self.registry_endpoint = value
11390+
elif key == "fw-tf-rac-endpoint" and not self.rac_endpoint:
11391+
self.rac_endpoint = value
11392+
elif key == "fw-tf-platform-endpoint" and not self.platform_endpoint:
11393+
self.platform_endpoint = value
11394+
else:
11395+
config.set(self.config.environment, key, value)
11396+
11397+
with open(appserver_file, "w") as configfile:
11398+
config.write(configfile)
11399+
11400+
logger().info(f'Endpoints has been updated in .ini file!')
11401+
11402+
11403+
else:
11404+
logger().info(f"AppServerFolder key not defined. Please check config.json file")
11405+
1136511406

1136611407
def get_route_mock(self):
1136711408
"""Set up mock server ip on appserver.ini file

0 commit comments

Comments
 (0)