Update tests for hub and spoke blueprints

blueprints/networking/hub-and-spoke-peering/README.md

@@ -100,3 +100,20 @@ The VPN used to connect the GKE masters VPC does not account for HA, upgrading t
 | [vms](outputs.tf#L20) | GCE VMs. |  |
 
 <!-- END TFDOC -->
+
+## Test
+
+```hcl
+module "test" {
+  source = "./fabric/blueprints/networking/hub-and-spoke-peering"
+  prefix = "prefix"
+  project_create = {
+    billing_account = "123456-123456-123456"
+    oslogin         = true
+    parent          = "folders/123456789"
+  }
+  project_id = "project-1"
+}
+
+# tftest modules=22 resources=61
+```

blueprints/networking/hub-and-spoke-vpn/README.md

@@ -101,3 +101,18 @@ ping test-r2.dev.example.com
 | [vms](outputs.tf#L39) | GCE VMs. |  |
 
 <!-- END TFDOC -->
+
+## Test
+```hcl
+module "test" {
+  source = "./fabric/blueprints/networking/hub-and-spoke-vpn"
+  prefix = "prefix"
+  project_create_config = {
+    billing_account_id = "123456-123456-123456"
+    parent_id          = "folders/123456789"
+  }
+  project_id = "project-1"
+}
+
+# tftest modules=20 resources=73
+```

tests/blueprints/networking/hub_and_spoke_peering/__init__.py

@@ -1,13 +0,0 @@
-# Copyright 2022 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
-#
-#      http://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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.

tests/blueprints/networking/hub_and_spoke_peering/fixture/main.tf

@@ -1,26 +0,0 @@
-/**
- * Copyright 2022 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
- *
- *      http://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,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-module "test" {
-  source = "../../../../../blueprints/networking/hub-and-spoke-peering"
-  prefix = var.prefix
-  project_create = {
-    billing_account = "123456-123456-123456"
-    oslogin         = true
-    parent          = "folders/123456789"
-  }
-  project_id = var.project_id
-}

tests/blueprints/networking/hub_and_spoke_peering/fixture/variables.tf

@@ -1,23 +0,0 @@
-# Copyright 2022 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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-variable "prefix" {
-  type    = string
-  default = "test"
-}
-
-variable "project_id" {
-  type    = string
-  default = "project-1"
-}

tests/blueprints/networking/hub_and_spoke_peering/test_plan.py

@@ -1,20 +0,0 @@
-# Copyright 2022 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
-#
-#      http://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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def test_resources(e2e_plan_runner):
-  "Test that plan works and the numbers of resources is as expected."
-  modules, resources = e2e_plan_runner()
-  assert len(modules) == 21
-  assert len(resources) == 61

tests/blueprints/networking/hub_and_spoke_vpn/__init__.py

@@ -1,13 +0,0 @@
-# Copyright 2022 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
-#
-#      http://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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.

tests/blueprints/networking/hub_and_spoke_vpn/fixture/main.tf

@@ -1,25 +0,0 @@
-/**
- * Copyright 2022 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
- *
- *      http://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,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-module "test" {
-  source = "../../../../../blueprints/networking/hub-and-spoke-vpn"
-  prefix = var.prefix
-  project_create_config = {
-    billing_account_id = "ABCDE-123456-ABCDE"
-    parent_id          = null
-  }
-  project_id = var.project_id
-}

tests/blueprints/networking/hub_and_spoke_vpn/fixture/variables.tf

@@ -1,23 +0,0 @@
-# Copyright 2022 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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-variable "prefix" {
-  type    = string
-  default = "test"
-}
-
-variable "project_id" {
-  type    = string
-  default = "project-1"
-}

tests/blueprints/networking/hub_and_spoke_vpn/test_plan.py

@@ -1,20 +0,0 @@
-# Copyright 2022 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
-#
-#      http://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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-def test_resources(e2e_plan_runner):
-  "Test that plan works and the numbers of resources is as expected."
-  modules, resources = e2e_plan_runner()
-  assert len(modules) == 19
-  assert len(resources) == 73