rapid-cdn: Fix re6st-verification-url testing

 * the default is already tested so drop TestRe6stVerificationUrlDefaultSlave
 * use locally provided URL to check re6st-verification-url, to not depend
   on external resources

!1501 did a good job with making default disabled, but during the code
review tests changes were not well checked.

software/rapid-cdn/test/test.py

@@ -87,9 +87,6 @@ KEDIFA_PORT = '15080'
 SOURCE_IP = '127.0.0.1'
 SOURCE_IPV6 = '::1'
 
-# URL used to check for network connectivity
-RE6ST_URL = 'http://[2001:67c:1254:4::1]/index.html'
-
 # IP on which test run, in order to mimic HTTP[s] access
 TEST_IP = os.environ['SLAPOS_TEST_IPV4']
 
@@ -5075,17 +5072,17 @@ class TestReplicateSlaveOtherDestroyed(
     self.assertFalse(node_2_present)
 
 
-class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
-                                           TestDataMixin):
+class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase, TestDataMixin):
   @classmethod
   def getInstanceParameterDict(cls):
+    cls.re6st_test_url = '%sre6st.html' % (cls.backend_url,)
     return {
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
-      're6st-verification-url': RE6ST_URL,
+      're6st-verification-url': cls.re6st_test_url,
     }
 
   @classmethod
@@ -5116,61 +5113,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
     self.assertEqual(
       getPromisePluginParameterDict(re6st_connectivity_promise_file),
       {
-        'url': RE6ST_URL,
-      }
-    )
-
-
-class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase,
-                                    TestDataMixin):
-  instance_parameter_dict = {
-      'port': HTTPS_PORT,
-      'domain': 'example.com',
-      'plain_http_port': HTTP_PORT,
-      'kedifa_port': KEDIFA_PORT,
-      'caucase_port': CAUCASE_PORT,
-      're6st-verification-url': RE6ST_URL,
-    }
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    return cls.instance_parameter_dict
-
-  @classmethod
-  def getSlaveParameterDictDict(cls):
-    return {
-      'default': {
-        'url': cls.backend_url,
-        'enable_cache': True,
-      },
-    }
-
-  def test_default(self):
-    self.instance_parameter_dict[
-      're6st-verification-url'] = 'some-re6st-verification-url'
-    # re-request instance with updated parameters
-    self.requestDefaultInstance()
-
-    # run once instance, it's only needed for later checks
-    try:
-      self.slap.waitForInstance()
-    except Exception:
-      pass
-
-    self.assertSlaveBase('default')
-
-    re6st_connectivity_promise_list = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'etc', 'plugin',
-        're6st-connectivity.py'))
-
-    self.assertEqual(1, len(re6st_connectivity_promise_list))
-    re6st_connectivity_promise_file = re6st_connectivity_promise_list[0]
-
-    self.assertEqual(
-      getPromisePluginParameterDict(re6st_connectivity_promise_file),
-      {
-        'url': 'some-re6st-verification-url',
+        'url': self.re6st_test_url,
       }
     )
 

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt

-[
-  {
-    "caucase_port": "15090",
-    "domain": "example.com",
-    "full_address_list": [],
-    "instance_title": "testing partition 0",
-    "kedifa_port": "15080",
-    "plain_http_port": "11080",
-    "port": "11443",
-    "re6st-verification-url": "http://[2001:67c:1254:4::1]/index.html",
-    "root_instance_title": "testing partition 0",
-    "slap_computer_id": "local",
-    "slap_computer_partition_id": "T-0",
-    "slap_software_release_url": "@@00getSoftwareURL@@",
-    "slap_software_type": "RootSoftwareInstance",
-    "slave_instance_list": [
-      {
-        "enable_cache": true,
-        "slap_software_type": "RootSoftwareInstance",
-        "slave_reference": "_default",
-        "slave_title": "_default",
-        "url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
-      }
-    ],
-    "timestamp": "@@TIMESTAMP@@"
-  },
-  {
-    "_": {
-      "caucase_port": "15090",
-      "cluster-identification": "testing partition 0",
-      "kedifa_port": "15080",
-      "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": "8402",
-      "monitor-password": "@@monitor-password@@",
-      "monitor-username": "admin",
-      "slave-list": [
-        {
-          "enable_cache": true,
-          "slave_reference": "_default",
-          "url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
-        }
-      ]
-    },
-    "full_address_list": [],
-    "instance_title": "kedifa",
-    "root_instance_title": "testing partition 0",
-    "slap_computer_id": "local",
-    "slap_computer_partition_id": "T-1",
-    "slap_software_release_url": "@@00getSoftwareURL@@",
-    "slap_software_type": "kedifa",
-    "slave_instance_list": [],
-    "timestamp": "@@TIMESTAMP@@"
-  },
-  {
-    "_": {
-      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
-      "cluster-identification": "testing partition 0",
-      "domain": "example.com",
-      "enable-http3": "false",
-      "extra_slave_instance_list": "[{\"enable_cache\": true, \"slave_reference\": \"_default\", \"url\": \"http://@@_ipv4_address@@:@@_server_http_port@@/\"}]",
-      "frontend-name": "caddy-frontend-1",
-      "http3-port": "443",
-      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:15090",
-      "master-key-download-url": "https://[@@_ipv6_address@@]:15080/@@master-key-download-url_endpoint@@",
-      "monitor-cors-domains": "monitor.app.officejs.com",
-      "monitor-httpd-port": 8411,
-      "monitor-password": "@@monitor-password@@",
-      "monitor-username": "admin",
-      "plain_http_port": "11080",
-      "port": "11443",
-      "re6st-verification-url": "http://[2001:67c:1254:4::1]/index.html",
-      "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@?auth=\"}}"
-    },
-    "full_address_list": [],
-    "instance_title": "caddy-frontend-1",
-    "root_instance_title": "testing partition 0",
-    "slap_computer_id": "local",
-    "slap_computer_partition_id": "T-2",
-    "slap_software_release_url": "@@00getSoftwareURL@@",
-    "slap_software_type": "single-custom-personal",
-    "slave_instance_list": [],
-    "timestamp": "@@TIMESTAMP@@"
-  }
-]

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/backend-haproxy.log
-T-2/var/log/expose-csr.log
-T-2/var/log/frontend-haproxy.log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/slave-introspection-access.log
-T-2/var/log/slave-introspection-error.log
-T-2/var/log/trafficserver/manager.log

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/logrotate-setup.state
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/backend-haproxy-rsyslogd.pid
-T-2/var/run/backend-haproxy.pid
-T-2/var/run/backend_haproxy_configuration_last_state
-T-2/var/run/backend_haproxy_graceful_configuration_state_signature
-T-2/var/run/bhlog.sck
-T-2/var/run/fhlog.sck
-T-2/var/run/frontend-haproxy-rsyslogd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/logrotate-setup.state
-T-2/var/run/monitor-httpd.pid
-T-2/var/run/slave-introspection.pid
-T-2/var/run/slave_introspection_configuration_last_state
-T-2/var/run/slave_introspection_graceful_configuration_state_signature

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt

-T-0:aibcc-user-caucase-updater-on-watch RUNNING
-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:logrotate-setup-validate EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
-T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-safe-graceful EXITED
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr-{hash-generic}-on-watch RUNNING
-T-2:frontend-haproxy-{hash-generic}-on-watch RUNNING
-T-2:frontend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
-T-2:frontend-haproxy-safe-graceful EXITED
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:logrotate-setup-validate EXITED
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
-T-2:slave-introspection-safe-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aibcc-sign-promise.py
-T-0/etc/plugin/aibcc-user-caucase-updater.py
-T-0/etc/plugin/aikc-sign-promise.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/caucased-backend-client.py
-T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/check-monitor-frontend-password.py
-T-0/etc/plugin/master-introspection-server-ip-port-listening.py
-T-0/etc/plugin/master-key-download-url-ready-promise.py
-T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
-T-0/etc/plugin/master-key-upload-url-ready-promise.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/publish-failsafe-error.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/check-monitor-frontend-password.py
-T-1/etc/plugin/expose-csr-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-1/etc/plugin/promise-kedifa-auth-ready.py
-T-1/etc/plugin/promise-logrotate-setup.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/backend-client-caucase-updater.py
-T-2/etc/plugin/backend-haproxy-configuration.py
-T-2/etc/plugin/backend-haproxy-statistic-frontend.py
-T-2/etc/plugin/backend_haproxy_http.py
-T-2/etc/plugin/backend_haproxy_https.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/check-monitor-frontend-password.py
-T-2/etc/plugin/expose-csr-ip-port-listening.py
-T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
-T-2/etc/plugin/frontend_haproxy_ipv4_http.py
-T-2/etc/plugin/frontend_haproxy_ipv4_https.py
-T-2/etc/plugin/frontend_haproxy_ipv6_http.py
-T-2/etc/plugin/frontend_haproxy_ipv6_https.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/promise-key-download-url-ready.py
-T-2/etc/plugin/promise-logrotate-setup.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/slave-introspection-configuration.py
-T-2/etc/plugin/slave_introspection_https.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt

@@ -7,7 +7,7 @@
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
-    "re6st-verification-url": "http://[2001:67c:1254:4::1]/index.html",
+    "re6st-verification-url": "http://@@_ipv4_address@@:@@_server_http_port@@/re6st.html",
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-0",
@@ -68,7 +68,7 @@
       "monitor-username": "admin",
       "plain_http_port": "11080",
       "port": "11443",
-      "re6st-verification-url": "http://[2001:67c:1254:4::1]/index.html",
+      "re6st-verification-url": "http://@@_ipv4_address@@:@@_server_http_port@@/re6st.html",
       "slave-kedifa-information": "{\"_default\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:15090\", \"key-download-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@/@@default_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:15080/@@default_key-generate-auth-url@@?auth=\"}}"
     },
     "full_address_list": [],

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt

@@ -8,9 +8,6 @@ T-1/var/log/monitor-httpd-error.log
 T-2/var/log/backend-haproxy.log
 T-2/var/log/expose-csr.log
 T-2/var/log/frontend-haproxy.log
-T-2/var/log/httpd/_default_access_log
-T-2/var/log/httpd/_default_backend_log
-T-2/var/log/httpd/_default_frontend_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log
 T-2/var/log/slave-introspection-access.log