Backport of istio generated replication channel with tunneling set to false

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

@@ -1371,7 +1371,7 @@ def _writeIstioReplicationChannelNAP(self, name, listen_address, listen_port,
     self.writeln('<d:public-address %s>%s.%s</d:public-address>' % (action, listen_address,
                                     self.env.getEnvOrDef("ISTIO_POD_NAMESPACE", "default")))
     self.writeln('<d:listen-port %s>%s</d:listen-port>' % (action, listen_port))
-    self.writeln('<d:http-enabled-for-this-protocol %s>true</d:http-enabled-for-this-protocol>' %
+    self.writeln('<d:http-enabled-for-this-protocol %s>false</d:http-enabled-for-this-protocol>' %
                  (action))
     self.writeln('<d:enabled %s>true</d:enabled>' % action)
     self.writeln('<d:outbound-enabled %s>false</d:outbound-enabled>' % action)

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ------------
@@ -538,12 +538,12 @@ def customizeIstioReplicationChannel(server, name, listen_address):
     _writeIstioNAP(name='istiorepl', server=server, listen_address=listen_address,
                  listen_port=istio_repl_listen_port, protocol='t3', http_enabled="true",
                  bind_to_localhost="true", use_fast_serialization='true',
-                 tunneling_enabled='true')
+                 tunneling_enabled='false')
   else:
     _writeIstioNAP(name='istiorepl', server=server, listen_address=listen_address,
                    listen_port=istio_repl_listen_port, protocol='t3', http_enabled="true",
                    bind_to_localhost="false", use_fast_serialization='true',
-                   tunneling_enabled='true')
+                   tunneling_enabled='false')
 
 def raise_replication_port_conflict(name, listen_port, replication_port, SSL):
   raise ValueError('Server/ServerTemplate %s %s listen port %s conflicts with default replication channel port %s when '

operator/src/test/python/test_wdt_mii_filter.py

@@ -1,3 +1,6 @@
+# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
 import ast
 import os
 import unittest
@@ -376,6 +379,7 @@ def test_customizeIstioReplicationChannel_version_1_10(self):
       istiorepl_nap = model['topology']['ServerTemplate']['cluster-1-template']['NetworkAccessPoint']['istiorepl']
       self.assertIsNotNone(istiorepl_nap, "Expected a NAP named \'istiorepl\' to be defined")
 
+      self.assertEqual(istiorepl_nap['TunnelingEnabled'], 'false')
       nap_listen_address = istiorepl_nap['ListenAddress']
       self.assertEqual('sample-domain1-managed-server${id}', nap_listen_address,
                        "Expected nap listen address to be \'sample-domain1-managed-server${id}\'")