kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed tests

Browse Source
This commit is contained in:
eliamaldini
2023-08-18 15:38:35 +02:00
parent e762e93677
commit 87e82244af
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/gcve-private-cloud/README.md
View File

@@ -23,19 +23,19 @@ At the moment this module doesn't support the following use cases:
```hcl
module "gcve-pc" {
source = "./fabric/modules/gcve-private-cloud"
name = "gcve-pc"
project_id = "gcve-test-project"
zone = "europe-west8-a"
cidr = "192.168.0.0/24"
source = "./fabric/modules/gcve-private-cloud"
name = "gcve-pc"
project_id = "gcve-test-project"
zone = "europe-west8-a"
cidr = "192.168.0.0/24"
private_connections = {
transit-conn1 = {
name = "transit-conn1",
network_self_link = "projects/test-prj-gcve-01/global/networks/default",
peering_name = "servicenetworking-googleapis-com"
type = "PRIVATE_SERVICE_ACCESS",
routing_mode = "REGIONAL"
name = "transit-conn1"
network_self_link = "projects/test-prj-gcve-01/global/networks/default"
tenant_host_project = "g39a814990532d10ap-tp"
type = "PRIVATE_SERVICE_ACCESS"
routing_mode = "REGIONAL"
}
}
}
@@ -45,11 +45,11 @@ module "gcve-pc" {
```hcl
module "gcve-pc" {
source = "./fabric/modules/gcve-private-cloud"
name = "gcve-pc"
project_id = "gcve-test-project"
zone = "europe-west8-a"
cidr = "192.168.0.0/24"
source = "./fabric/modules/gcve-private-cloud"
name = "gcve-pc"
project_id = "gcve-test-project"
zone = "europe-west8-a"
cidr = "192.168.0.0/24"
management_cluster_config = {
node_type_id = "standard-72"
@@ -59,11 +59,11 @@ module "gcve-pc" {
private_connections = {
transit-conn1 = {
name = "transit-conn1",
network_self_link = "projects/test-prj-gcve-01/global/networks/default",
peering_name = "servicenetworking-googleapis-com"
type = "PRIVATE_SERVICE_ACCESS",
routing_mode = "REGIONAL"
name = "transit-conn1"
network_self_link = "projects/test-prj-gcve-01/global/networks/default"
tenant_host_project = "g39a814990532d10ap-tp"
type = "PRIVATE_SERVICE_ACCESS"
routing_mode = "REGIONAL"
}
}
}
@@ -76,13 +76,13 @@ module "gcve-pc" {
|---|---|:---:|:---:|:---:|
| [cidr](variables.tf#L23) | vSphere/vSAN subnets CIDR range. To undersatnd the limits, please refer to [GCVE network requirements](https://cloud.google.com/vmware-engine/docs/quickstart-networking-requirements). | <code>string</code> | ✓ | |
| [name](variables.tf#L43) | Private cloud name. | <code>string</code> | ✓ | |
| [project_id](variables.tf#L76) | Project id. | <code>string</code> | ✓ | |
| [zone](variables.tf#L93) | Private cloud zone. | <code>string</code> | ✓ | |
| [project_id](variables.tf#L85) | Project id. | <code>string</code> | ✓ | |
| [zone](variables.tf#L102) | Private cloud zone. | <code>string</code> | ✓ | |
| [description](variables.tf#L17) | Private cloud description. | <code>string</code> | | <code>&#34;Terraform-managed.&#34;</code> |
| [management_cluster_config](variables.tf#L28) | Management cluster configuration. | <code title="object&#40;&#123;&#10; node_type_id &#61; string&#10; node_count &#61; number,&#10; custom_core_count &#61; number&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code title="&#123;&#10; node_type_id &#61; &#34;standard-72&#34;,&#10; node_count &#61; 3,&#10; custom_core_count &#61; null&#10;&#125;">&#123;&#8230;&#125;</code> |
| [private_connections](variables.tf#L48) | VMWare private connections configuration. It is used to create the gcloud command printed as output. | <code title="map&#40;object&#40;&#123;&#10; name &#61; string&#10; network_self_link &#61; string&#10; peering_name &#61; string&#10; description &#61; optional&#40;string, &#34;Terraform-managed.&#34;&#41;&#10; type &#61; optional&#40;string, &#34;PRIVATE_SERVICE_ACCESS&#34;&#41;&#10; routing_mode &#61; optional&#40;string, &#34;REGIONAL&#34;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
| [vmw_network_create](variables.tf#L81) | Create the VMware Engine network. When set to false, it uses a data source to reference an existing VMware Engine network. | <code>bool</code> | | <code>true</code> |
| [vmw_network_description](variables.tf#L87) | VMware Engine network description. | <code>string</code> | | <code>&#34;Terraform-managed.&#34;</code> |
| [private_connections](variables.tf#L48) | VMWare private connections configuration. It is used to create the gcloud command printed as output. | <code title="map&#40;object&#40;&#123;&#10; name &#61; string&#10; network_self_link &#61; string&#10; peering_name &#61; optional&#40;string&#41;&#10; tenant_host_project &#61; optional&#40;string&#41;&#10; description &#61; optional&#40;string, &#34;Terraform-managed.&#34;&#41;&#10; type &#61; optional&#40;string, &#34;PRIVATE_SERVICE_ACCESS&#34;&#41;&#10; routing_mode &#61; optional&#40;string, &#34;REGIONAL&#34;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
| [vmw_network_create](variables.tf#L90) | Create the VMware Engine network. When set to false, it uses a data source to reference an existing VMware Engine network. | <code>bool</code> | | <code>true</code> |
| [vmw_network_description](variables.tf#L96) | VMware Engine network description. | <code>string</code> | | <code>&#34;Terraform-managed.&#34;</code> |
## Outputs
@@ -96,5 +96,6 @@ module "gcve-pc" {
| [private-cloud](outputs.tf#L42) | The private cloud resource | |
| [private_connections_setup](outputs.tf#L47) | Cloud SDK commands for the private connections manual setup. | |
| [state](outputs.tf#L63) | Details about the state of the private cloud | |
| [test](outputs.tf#L73) | | |
| [vcenter](outputs.tf#L68) | Details about a vCenter Server management appliance. | |
<!-- END TFDOC -->

11
modules/gcve-private-cloud/main.tf
View File

@@ -21,9 +21,10 @@ locals {
? try(google_vmwareengine_network.private-cloud-network.0, null)
: try(data.google_vmwareengine_network.private-cloud-network.0, null)
)
psa_peering = {
for k, v in data.google_compute_network_peering.psa_peering :
k => regex("(.*)/projects/([a-z0-9-]*)/(.*)", "${v.peer_network}")[1]
tenant_host_project = {
for k, v in var.private_connections : k => v.tenant_host_project == null
? regex("(.*)/projects/([a-z0-9-]*)/(.*)", "${data.google_compute_network_peering.psa_peering[k].peer_network}")[1]
: v.tenant_host_project
}
}
@@ -35,10 +36,8 @@ data "google_vmwareengine_network" "private-cloud-network" {
location = local.region
}
#TO REMOVE?
data "google_compute_network_peering" "psa_peering" {
for_each = var.private_connections
for_each = { for k, v in var.private_connections : k => v if v.tenant_host_project == null }
name = each.value.peering_name
network = each.value.network_self_link
}

2
modules/gcve-private-cloud/outputs.tf
View File

@@ -54,7 +54,7 @@ output "private_connections_setup" {
--vmware-engine-network=${local.region}-default \
--description="${v.description}" \
--routing-mode=${v.routing_mode} \
--service-project=${local.psa_peering[k]} \
--service-project=${local.tenant_host_project[k]} \
--type=${v.type}
EOT
}

21
modules/gcve-private-cloud/variables.tf
View File

@@ -48,15 +48,24 @@ variable "name" {
variable "private_connections" {
description = "VMWare private connections configuration. It is used to create the gcloud command printed as output."
type = map(object({
name = string
network_self_link = string
peering_name = string
description = optional(string, "Terraform-managed.")
type = optional(string, "PRIVATE_SERVICE_ACCESS")
routing_mode = optional(string, "REGIONAL")
name = string
network_self_link = string
peering_name = optional(string)
tenant_host_project = optional(string)
description = optional(string, "Terraform-managed.")
type = optional(string, "PRIVATE_SERVICE_ACCESS")
routing_mode = optional(string, "REGIONAL")
}))
default = {}
nullable = false
validation {
condition = alltrue([
for k, v in var.private_connections :
(v.peering_name != null) != (v.tenant_host_project != null)
]
)
error_message = "Both peering_name and tenant_host_project variables have been set. Only one variable is allowed."
}
validation {
condition = alltrue([
for r in var.private_connections :