From 1818a56085d480770120cb06b7240651f1957f93 Mon Sep 17 00:00:00 2001
From: pierrecouch <pierre.regazzoni@couchbase.com>
Date: Mon, 11 Oct 2021 11:28:57 -0700
Subject: [PATCH] Update for enforce_tls

- move setting tls up in setup to avoid skip
- remove duplicate disable enforce_tls
- don't verify data when tls_enforce set

Change-Id: Iccb04dcf7e8aaf634f27a6b3c8da45181b6fdc8c
Reviewed-on: http://review.couchbase.org/c/testrunner/+/163384
Reviewed-by: Ajay Bhullar <ajay.bhullar@couchbase.com>
Reviewed-by: Sumedh Basarkod <sumedhpb8@gmail.com>
---
 pytests/basetestcase.py | 18 ++++++++----------
 pytests/tuqquery/tuq.py |  5 ++++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pytests/basetestcase.py b/pytests/basetestcase.py
index 3161ced814..a6cd8f022f 100644
--- a/pytests/basetestcase.py
+++ b/pytests/basetestcase.py
@@ -275,6 +275,14 @@ def setUp(self):
                 self.log.info("Building docker image with java sdk client")
                 JavaSdkSetup()
 
+            if self.use_https:
+                if self.enforce_tls:
+                    self.log.info("#####Enforcing TLS########")
+                    ntonencryptionBase().setup_nton_cluster([self.master], clusterEncryptionLevel="strict")
+                    status = ClusterOperationHelper.check_if_services_obey_tls(servers=[self.master])
+                    if not status:
+                        self.fail("Port binding after enforcing TLS incorrect")
+
             # avoid any cluster operations in setup for new upgrade
             #  & upgradeXDCR tests
             if str(self.__class__).find('newupgradetests') != -1 or \
@@ -379,13 +387,6 @@ def setUp(self):
                 cli.setting_autofailover(1, 60)
                 self.sleep(2)
                 self.check_ip_family_enforcement(ip_family="ipv6_only")
-            if self.use_https:
-                if self.enforce_tls:
-                    self.log.info("#####Enforcing TLS########")
-                    ntonencryptionBase().setup_nton_cluster([self.master], clusterEncryptionLevel="strict")
-                    status = ClusterOperationHelper.check_if_services_obey_tls(servers=[self.master])
-                    if not status:
-                        self.fail("Port binding after enforcing TLS incorrect")
             # Perform a custom rebalance by setting input param `custom_rebalance` to True
             # and implement the make_cluster method in a child class. This works by setting
             # skip_rebalance to True and then calling your custom rebalance method.
@@ -589,9 +590,6 @@ def tearDown(self):
             #output = cli.get_ip_family()
             cli.setting_autofailover(1, 60)
             #self.assertEqual(output[0][0]], "Cluster using ipv6", "Failed to change IP family")
-        if self.input.param("enforce_tls", False):
-            self.log.info('###################### Disabling n2n encryption')
-            ntonencryptionBase().disable_nton_cluster([self.master])
         self.print_cluster_stats()
 
         self.log_scan_file_prefix = f'{self._testMethodName}_test_{self.case_number}'
diff --git a/pytests/tuqquery/tuq.py b/pytests/tuqquery/tuq.py
index bab538cee7..f619e21c2d 100644
--- a/pytests/tuqquery/tuq.py
+++ b/pytests/tuqquery/tuq.py
@@ -209,7 +209,10 @@ def suite_setUp(self):
                     self.load_directory(self.gens_load)
                 else:
                     self.log.info("-->gens_load flat_json, batch_size=1000")
-                    self.load(self.gens_load, batch_size=1000, flag=self.item_flag)
+                    verify_data = True
+                    if self.enforce_tls:
+                        verify_data = False
+                    self.load(self.gens_load, batch_size=1000, flag=self.item_flag, verify_data=verify_data)
             if not self.input.param("skip_build_tuq", True):
                 self._build_tuq(self.master)
             self.skip_buckets_handle = True