OWLS-98083 - Create port-forward NAP when admin server name not defined in WDT model (#2911) (#2929)

* OWLS-98083 - Fix for port-forwarding to handle cases where admin server name not defined in WDT model file.

* Change the unit test name.

* Changes as per Robert's review comments.

Author: ankedia

operator/src/main/resources/scripts/model_wdt_mii_filter.py

@@ -326,14 +326,20 @@ def customizeServers(model):
 
 def customizeServer(model, server, name):
   listen_address=env.toDNS1123Legal(env.getDomainUID() + "-" + name)
-  adminServer = model['topology']['AdminServerName']
+
+  adminServer = None
+  if 'AdminServerName' in model['topology'] and len(model['topology']['AdminServerName']) > 0:
+    adminServer = model['topology']['AdminServerName']
+
   customizeLog(name, server)
   customizeAccessLog(name, server)
   customizeDefaultFileStore(server)
   setServerListenAddress(server, listen_address)
   customizeNetworkAccessPoints(server,listen_address)
   customizeServerIstioNetworkAccessPoint(server, listen_address)
-  if (name == adminServer):
+  # If the admin server name is not provided in the WDT model,
+  # use the default name 'AdminServer'.
+  if (name == adminServer or  name == 'AdminServer'):
     addAdminChannelPortForwardNetworkAccessPoints(server)
   else:
     customizeIstioReplicationChannel(server, name, listen_address)

operator/src/test/python/test_wdt_mii_filter.py

@@ -91,6 +91,20 @@ def getStaticModel(self):
 
     return model
 
+  def getModelWithoutAdminServerName(self):
+    # Load model as dictionary
+    file = open(r'../resources/model.dict_without_admin_server_name.txt')
+    contents = file.read()
+    model = ast.literal_eval(contents)
+    file.close()
+
+    # Setup mock environment
+    mock_env= MockOfflineWlstEnv()
+    mock_env.open(model)
+    model_wdt_mii_filter.env = mock_env
+
+    return model
+
   def writeModelAsDict(self, model, file_path):
     f = open(file_path,"w")
     f.write( str(model) )
@@ -229,6 +243,19 @@ def test_customize_port_forward_network_access_point_multiple_custom_admin_chann
     internal_custom1_nap_listen_port = server['NetworkAccessPoint']['internal-admin2']['ListenPort']
     self.assertEqual(7897, internal_custom1_nap_listen_port, "Expected nap listen address to be \'7897\'")
 
+  def test_port_forward_network_access_point_when_admin_server_name_not_defined(self):
+    model = self.getModelWithoutAdminServerName()
+    servers = model['topology']['Server']
+    names = servers.keys()
+    for name in names:
+      server = servers[name]
+      model_wdt_mii_filter.customizeServer(model, server, name)
+
+      internal_admin_nap_listen_address = server['NetworkAccessPoint']['internal-admin']['ListenAddress']
+      self.assertEqual('localhost', internal_admin_nap_listen_address, "Expected nap listen address to be \'localhost\'")
+      internal_admin_nap_listen_port = server['NetworkAccessPoint']['internal-admin']['ListenPort']
+      self.assertEqual(9002, internal_admin_nap_listen_port, "Expected nap listen port to be \'9002\'")
+
   def test_customizeServerTemplates(self):
     model = self.getModel()
 

operator/src/test/resources/model.dict_without_admin_server_name.txt

@@ -0,0 +1 @@
+{'appDeployments': {'Application': {'myapp': {'SourcePath': 'wlsdeploy/applications/myapp-v1', 'ModuleType': 'ear', 'Target': 'cluster-1'}}}, 'domainInfo': {'AdminUserName': 'weblogic', 'ServerStartMode': 'dev', 'AdminPassword': 'welcome1'}, 'resources': {'FileStore': {'FileStore-0': {'Directory': '/u01/oracle/customFileStore/', 'Target': 'cluster-1'}}}, 'topology': {'Cluster': {'cluster-1': {'DynamicServers': {'MinDynamicClusterSize': '0', 'CalculatedListenPorts': False, 'MaxDynamicClusterSize': '5', 'ServerNamePrefix': 'managed-server', 'DynamicClusterSize': '5', 'ServerTemplate': 'cluster-1-template'}}}, 'Name': 'sample-domain1', 'AdministrationPortEnabled': 'true', 'ServerTemplate': {'cluster-1-template': {'NetworkAccessPoint': {'T3Channel': {'PublicAddress': 'admin-server-public-service', 'PublicPort': 9003, 'ListenAddress': 'admin-server-service', 'ListenPort': 8003}}, 'Cluster': 'cluster-1', 'ListenPort': 8001}}, 'Server': {'AdminServer': {'NetworkAccessPoint': {'ASChannel': {'TunnelingEnabled': False, 'Protocol': 'admin', 'HttpEnabledForThisProtocol': True, 'ListenPort': 7896, 'PublicPort': 7896, 'Enabled': True, 'ListenAddress': 'domain1-admin-server'}, 'AS1Channel': {'TunnelingEnabled': False, 'Protocol': 'admin', 'HttpEnabledForThisProtocol': True, 'ListenPort': 7897, 'PublicPort': 7897, 'Enabled': True, 'ListenAddress': 'domain1-admin-server'}}, 'ListenPort': 7001}}}}