Site device to reflect registry (#247)

* added site device to reflect registry and other bugfixes
faucetsdn · Feb 17, 2022 · 8077e71 · 8077e71
1 parent a433f68
commit 8077e71
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/cloud/gcp/modules/terraform-google-udmi-site/examples/example.tf b/cloud/gcp/modules/terraform-google-udmi-site/examples/example.tf
@@ -1,11 +1,9 @@
 module "UK-LON-TEST" {
-  source      = "./modules/terraform-google-bos-site"
+  source      = "./modules/terraform-google-udmi-site"
   gcp_project = var.gcp_project
-  site_name   = "UK-LON-TEST"
+  gcp_region  = var.gcp_region
+  site_name   = "ZZ-TRI-FECTA"
   site_region = "europe-west1"
-  site_group  = "group:bos-corpops-testing-users-group@google.com"
+  site_group  = "group:group@example.com"
   log_level   = "DEBUG"
-  tags = {
-    Environment = "dev"
-  }
 }
diff --git a/cloud/gcp/modules/terraform-google-udmi-site/iotcore.tf b/cloud/gcp/modules/terraform-google-udmi-site/iotcore.tf
@@ -18,14 +18,35 @@ resource "google_cloudiot_registry" "site_cloudiot_registry" {
     log_level = var.log_level
 }
 
-resource "google_project_iam_member" "bos-corpops-testing_cloudiot_viewer" {
+resource "google_project_iam_member" "site_cloudiot_viewer" {
   project = var.gcp_project
   role    = "roles/cloudiot.viewer"
   member = var.site_group
 }
 
-resource "google_project_iam_member" "bos-corpops-testing_cloudiot_provisioner" {
+resource "google_project_iam_member" "site_cloudiot_provisioner" {
   project = var.gcp_project
   role    = "roles/cloudiot.provisioner"
   member = var.site_group
 }
+
+resource "google_cloudiot_device" "site_udmi_reflector_device" {
+  name     = var.site_name
+  registry = "projects/${var.gcp_project}/locations/${var.gcp_region}/registries/UDMS-REFLECT"
+
+  # TODO: add credentials
+  # credentials {
+  #   public_key {
+  #       format = "RSA_PEM"
+  #       key = file("rsa_public.pem")
+  #   }
+  # }
+
+  blocked = false
+
+  log_level = var.log_level
+
+  gateway_config {
+    gateway_type = "NON_GATEWAY"
+  }
+}
diff --git a/cloud/gcp/modules/terraform-google-udmi-site/readme.md b/cloud/gcp/modules/terraform-google-udmi-site/readme.md
@@ -17,6 +17,7 @@ Add one or more Terraform configuration files for the UDMI sites with the follow
 module "ZZ-TRI-FECTA" {
   source      = "./modules/terraform-google-udmi-site"
   gcp_project = var.gcp_project_name
+  gcp_region  = var.gcp_region
   site_name   = "ZZ-TRI-FECTA"
   site_region = "europe-west1"
   site_group  = "group:[email protected]"

diff --git a/cloud/gcp/modules/terraform-google-udmi-site/variables.tf b/cloud/gcp/modules/terraform-google-udmi-site/variables.tf
@@ -4,6 +4,12 @@ variable "gcp_project" {
   description = "GCP project name"
 }
 
+# define GCP project region
+variable "gcp_region" {
+  type = string
+  description = "GCP project region"
+}
+
 # define site name
 variable "site_name" {
   type        = string

diff --git a/cloud/gcp/udmi-sites.tf.template b/cloud/gcp/udmi-sites.tf.template
@@ -1,6 +1,7 @@
 module "ZZ-TRI-FECTA" {
   source      = "./modules/terraform-google-udmi-site"
   gcp_project = var.gcp_project_name
+  gcp_project = var.gcp_region
   site_name   = "@UDMI_SITE_NAME@"
   site_region = "@UDMI_SITE_REGION@"
   site_group  = "group:@UDMI_SITE_GROUP@"