diff --git a/monitoring/tests/system/test_vpcsc.py b/monitoring/tests/system/test_vpcsc_v3.py similarity index 71% rename from monitoring/tests/system/test_vpcsc.py rename to monitoring/tests/system/test_vpcsc_v3.py index ffc78cbfc047..6ef514fa2891 100644 --- a/monitoring/tests/system/test_vpcsc.py +++ b/monitoring/tests/system/test_vpcsc_v3.py @@ -1,12 +1,17 @@ # -*- coding: utf-8 -*- # +# flake8: noqa +# +# DO NOT MODIFY! THIS FILE IS AUTO-GENERATED. +# This file is auto-generated on 11 Oct 19 21:43 UTC. + # Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,22 +19,14 @@ # See the License for the specific language governing permissions and # limitations under the License. - -# DO NOT MODIFY! AUTO-GENERATED! -# This file is auto-generated on 2019-05-03. - -# flake8: noqa - import os import pytest - +import logging from google.api_core import exceptions from google.cloud import monitoring_v3 from google.cloud.monitoring_v3 import enums PROJECT_INSIDE = os.environ.get("PROJECT_ID", None) -if not PROJECT_INSIDE: - PROJECT_INSIDE = None PROJECT_OUTSIDE = os.environ.get( "GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", None ) @@ -39,6 +36,7 @@ class TestVPCServiceControlV3(object): @staticmethod def _is_rejected(call): + logger = logging.getLogger(__name__) try: responses = call() @@ -47,8 +45,10 @@ def _is_rejected(call): # instance, or None. list(responses) except exceptions.PermissionDenied as e: + logger.debug(e) return e.message == "Request is prohibited by organization's policy" - except: + except Exception as e: + logger.debug(e) pass return False @@ -62,10 +62,10 @@ def _do_test(delayed_inside, delayed_outside): assert TestVPCServiceControlV3._is_rejected(delayed_inside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_alert_policy(self): @@ -74,13 +74,13 @@ def test_create_alert_policy(self): delayed_inside = lambda: client.create_alert_policy(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_alert_policy(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_delete_alert_policy(self): @@ -89,13 +89,13 @@ def test_delete_alert_policy(self): delayed_inside = lambda: client.delete_alert_policy(name_inside) name_outside = client.alert_policy_path(PROJECT_OUTSIDE, "mock_alert_policy") delayed_outside = lambda: client.delete_alert_policy(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_alert_policy(self): @@ -104,13 +104,13 @@ def test_get_alert_policy(self): delayed_inside = lambda: client.get_alert_policy(name_inside) name_outside = client.alert_policy_path(PROJECT_OUTSIDE, "mock_alert_policy") delayed_outside = lambda: client.get_alert_policy(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_alert_policies(self): @@ -119,13 +119,13 @@ def test_list_alert_policies(self): delayed_inside = lambda: client.list_alert_policies(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.list_alert_policies(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_update_alert_policy(self): @@ -134,13 +134,13 @@ def test_update_alert_policy(self): delayed_inside = lambda: client.update_alert_policy({"name": name_inside}) name_outside = client.alert_policy_path(PROJECT_OUTSIDE, "mock_alert_policy") delayed_outside = lambda: client.update_alert_policy({"name": name_outside}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_group(self): @@ -149,13 +149,13 @@ def test_create_group(self): delayed_inside = lambda: client.create_group(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_group(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_delete_group(self): @@ -164,13 +164,13 @@ def test_delete_group(self): delayed_inside = lambda: client.delete_group(name_inside) name_outside = client.group_path(PROJECT_OUTSIDE, "mock_group") delayed_outside = lambda: client.delete_group(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_group(self): @@ -179,28 +179,28 @@ def test_get_group(self): delayed_inside = lambda: client.get_group(name_inside) name_outside = client.group_path(PROJECT_OUTSIDE, "mock_group") delayed_outside = lambda: client.get_group(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_group_members(self): client = monitoring_v3.GroupServiceClient() - name_inside = client.project_path(PROJECT_INSIDE) + name_inside = client.group_path(PROJECT_INSIDE, "mock_group") delayed_inside = lambda: client.list_group_members(name_inside) - name_outside = client.project_path(PROJECT_OUTSIDE) + name_outside = client.group_path(PROJECT_OUTSIDE, "mock_group") delayed_outside = lambda: client.list_group_members(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_groups(self): @@ -209,13 +209,13 @@ def test_list_groups(self): delayed_inside = lambda: client.list_groups(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.list_groups(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_update_group(self): @@ -224,13 +224,13 @@ def test_update_group(self): delayed_inside = lambda: client.update_group({"name": name_inside}) name_outside = client.group_path(PROJECT_OUTSIDE, "mock_group") delayed_outside = lambda: client.update_group({"name": name_outside}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_metric_descriptor(self): @@ -239,13 +239,13 @@ def test_create_metric_descriptor(self): delayed_inside = lambda: client.create_metric_descriptor(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_metric_descriptor(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_time_series(self): @@ -254,13 +254,13 @@ def test_create_time_series(self): delayed_inside = lambda: client.create_time_series(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_time_series(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_delete_metric_descriptor(self): @@ -273,13 +273,13 @@ def test_delete_metric_descriptor(self): PROJECT_OUTSIDE, "mock_metric_descriptor" ) delayed_outside = lambda: client.delete_metric_descriptor(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_metric_descriptor(self): @@ -292,13 +292,13 @@ def test_get_metric_descriptor(self): PROJECT_OUTSIDE, "mock_metric_descriptor" ) delayed_outside = lambda: client.get_metric_descriptor(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_monitored_resource_descriptor(self): @@ -311,13 +311,13 @@ def test_get_monitored_resource_descriptor(self): PROJECT_OUTSIDE, "mock_monitored_resource_descriptor" ) delayed_outside = lambda: client.get_monitored_resource_descriptor(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_metric_descriptors(self): @@ -326,13 +326,13 @@ def test_list_metric_descriptors(self): delayed_inside = lambda: client.list_metric_descriptors(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.list_metric_descriptors(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_monitored_resource_descriptors(self): @@ -343,13 +343,13 @@ def test_list_monitored_resource_descriptors(self): delayed_outside = lambda: client.list_monitored_resource_descriptors( name_outside ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_time_series(self): @@ -362,13 +362,13 @@ def test_list_time_series(self): delayed_outside = lambda: client.list_time_series( name_outside, "", {}, enums.ListTimeSeriesRequest.TimeSeriesView.FULL ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_notification_channel(self): @@ -377,13 +377,13 @@ def test_create_notification_channel(self): delayed_inside = lambda: client.create_notification_channel(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_notification_channel(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_delete_notification_channel(self): @@ -396,13 +396,13 @@ def test_delete_notification_channel(self): PROJECT_OUTSIDE, "mock_notification_channel" ) delayed_outside = lambda: client.delete_notification_channel(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_notification_channel(self): @@ -415,13 +415,13 @@ def test_get_notification_channel(self): PROJECT_OUTSIDE, "mock_notification_channel" ) delayed_outside = lambda: client.get_notification_channel(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_notification_channel_descriptor(self): @@ -436,13 +436,36 @@ def test_get_notification_channel_descriptor(self): delayed_outside = lambda: client.get_notification_channel_descriptor( name_outside ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) + + @pytest.mark.skipif( + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" + ) + @pytest.mark.skipif( + not PROJECT_OUTSIDE, + reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", + ) + def test_get_notification_channel_verification_code(self): + client = monitoring_v3.NotificationChannelServiceClient() + name_inside = client.notification_channel_path( + PROJECT_INSIDE, "mock_notification_channel" + ) + delayed_inside = lambda: client.get_notification_channel_verification_code( + name_inside + ) + name_outside = client.notification_channel_path( + PROJECT_OUTSIDE, "mock_notification_channel" + ) + delayed_outside = lambda: client.get_notification_channel_verification_code( + name_outside + ) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_notification_channel_descriptors(self): @@ -455,13 +478,13 @@ def test_list_notification_channel_descriptors(self): delayed_outside = lambda: client.list_notification_channel_descriptors( name_outside ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_notification_channels(self): @@ -470,13 +493,36 @@ def test_list_notification_channels(self): delayed_inside = lambda: client.list_notification_channels(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.list_notification_channels(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, + reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", + ) + def test_send_notification_channel_verification_code(self): + client = monitoring_v3.NotificationChannelServiceClient() + name_inside = client.notification_channel_path( + PROJECT_INSIDE, "mock_notification_channel" + ) + delayed_inside = lambda: client.send_notification_channel_verification_code( + name_inside + ) + name_outside = client.notification_channel_path( + PROJECT_OUTSIDE, "mock_notification_channel" + ) + delayed_outside = lambda: client.send_notification_channel_verification_code( + name_outside + ) + self._do_test(delayed_inside, delayed_outside) + + @pytest.mark.skipif( + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" + ) + @pytest.mark.skipif( + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_update_notification_channel(self): @@ -493,13 +539,32 @@ def test_update_notification_channel(self): delayed_outside = lambda: client.update_notification_channel( {"name": name_outside} ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) + + @pytest.mark.skipif( + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" + ) + @pytest.mark.skipif( + not PROJECT_OUTSIDE, + reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", + ) + def test_verify_notification_channel(self): + client = monitoring_v3.NotificationChannelServiceClient() + name_inside = client.notification_channel_path( + PROJECT_INSIDE, "mock_notification_channel" + ) + delayed_inside = lambda: client.verify_notification_channel(name_inside, "") + name_outside = client.notification_channel_path( + PROJECT_OUTSIDE, "mock_notification_channel" + ) + delayed_outside = lambda: client.verify_notification_channel(name_outside, "") + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_create_uptime_check_config(self): @@ -508,13 +573,13 @@ def test_create_uptime_check_config(self): delayed_inside = lambda: client.create_uptime_check_config(name_inside, {}) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.create_uptime_check_config(name_outside, {}) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_delete_uptime_check_config(self): @@ -527,13 +592,13 @@ def test_delete_uptime_check_config(self): PROJECT_OUTSIDE, "mock_uptime_check_config" ) delayed_outside = lambda: client.delete_uptime_check_config(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_get_uptime_check_config(self): @@ -546,13 +611,13 @@ def test_get_uptime_check_config(self): PROJECT_OUTSIDE, "mock_uptime_check_config" ) delayed_outside = lambda: client.get_uptime_check_config(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_list_uptime_check_configs(self): @@ -561,13 +626,13 @@ def test_list_uptime_check_configs(self): delayed_inside = lambda: client.list_uptime_check_configs(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) delayed_outside = lambda: client.list_uptime_check_configs(name_outside) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( - PROJECT_INSIDE is None, reason="Missing environment variable: PROJECT_ID" + not PROJECT_INSIDE, reason="Missing environment variable: PROJECT_ID" ) @pytest.mark.skipif( - PROJECT_OUTSIDE is None, + not PROJECT_OUTSIDE, reason="Missing environment variable: GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", ) def test_update_uptime_check_config(self): @@ -584,4 +649,4 @@ def test_update_uptime_check_config(self): delayed_outside = lambda: client.update_uptime_check_config( {"name": name_outside} ) - TestVPCServiceControlV3._do_test(delayed_inside, delayed_outside) + self._do_test(delayed_inside, delayed_outside)