Added - Support for EM managed host support for Solaris/SunOS in OPSI

Miguel Cabral · jotruon · commit 449d8e9c3ce8 · 2022-01-21T12:05:07.000-08:00
diff --git a/examples/opsi/database_insight/database_insight.tf b/examples/opsi/database_insight/database_insight.tf
@@ -48,7 +48,7 @@ variable "database_insight_entity_source" {
 }
 
 variable "database_insight_fields" {
-  default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags", "systemTags"]
+  default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags"]
 }
 
 variable "database_insight_freeform_tags" {
diff --git a/examples/opsi/exadata_insight/exadata_insight.tf b/examples/opsi/exadata_insight/exadata_insight.tf
@@ -8,8 +8,8 @@ variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 variable "enterprise_manager_bridge_ocid" {}
-variable "enterprise_manager_entity_id" {}
-variable "enterprise_manager_id" {}
+variable "em_exadata_enterprise_manager_entity_id" {}
+variable "em_exadata_enterprise_manager_id" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -59,8 +59,8 @@ variable "resource_status" {
 resource "oci_opsi_exadata_insight" "test_exadata_insight" {
   compartment_id                       = var.compartment_ocid
   enterprise_manager_bridge_id         = var.enterprise_manager_bridge_ocid
-  enterprise_manager_entity_identifier = var.enterprise_manager_entity_id
-  enterprise_manager_identifier        = var.enterprise_manager_id
+  enterprise_manager_entity_identifier = var.em_exadata_enterprise_manager_entity_id
+  enterprise_manager_identifier        = var.em_exadata_enterprise_manager_id
   entity_source                        = var.exadata_insight_entity_source
   defined_tags                         = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.exadata_insight_defined_tags_value}")}"
   freeform_tags                        = var.exadata_insight_freeform_tags
diff --git a/examples/opsi/host_insight/em_host_insight/em_host_insight.tf b/examples/opsi/host_insight/em_host_insight/em_host_insight.tf
@@ -9,8 +9,8 @@ variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
 variable "enterprise_manager_bridge_ocid" {}
-variable "enterprise_manager_entity_id" {}
-variable "enterprise_manager_id" {}
+variable "em_host_enterprise_manager_entity_id" {}
+variable "em_host_enterprise_manager_id" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -55,8 +55,8 @@ variable "resource_status" {
 resource "oci_opsi_host_insight" "test_host_insight" {
   compartment_id                        = var.compartment_ocid
   enterprise_manager_bridge_id          = var.enterprise_manager_bridge_ocid
-  enterprise_manager_entity_identifier  = var.enterprise_manager_entity_id
-  enterprise_manager_identifier         = var.enterprise_manager_id
+  enterprise_manager_entity_identifier  = var.em_host_enterprise_manager_entity_id
+  enterprise_manager_identifier         = var.em_host_enterprise_manager_id
   entity_source                         = var.host_insight_entity_source
   defined_tags                          = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.host_insight_defined_tags_value}")}"
   freeform_tags                         = var.host_insight_freeform_tags
diff --git a/internal/integrationtest/opsi_database_insight_test.go b/internal/integrationtest/opsi_database_insight_test.go
@@ -41,7 +41,7 @@ var (
 		"compartment_id_in_subtree":    acctest.Representation{RepType: acctest.Optional, Create: `false`},
 		"database_type":                acctest.Representation{RepType: acctest.Optional, Create: []string{`EXTERNAL-NONCDB`}},
 		"enterprise_manager_bridge_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.enterprise_manager_bridge_id}`},
-		"fields":                       acctest.Representation{RepType: acctest.Optional, Create: []string{`databaseName`, `databaseType`, `compartmentId`, `databaseDisplayName`, `freeformTags`, `definedTags`, `systemTags`}},
+		"fields":                       acctest.Representation{RepType: acctest.Optional, Create: []string{`databaseName`, `databaseType`, `compartmentId`, `databaseDisplayName`, `freeformTags`, `definedTags`}},
 		"id":                           acctest.Representation{RepType: acctest.Optional, Create: `${oci_opsi_database_insight.test_database_insight.id}`},
 		"state":                        acctest.Representation{RepType: acctest.Optional, Create: []string{`ACTIVE`}},
 		"status":                       acctest.Representation{RepType: acctest.Optional, Create: []string{`ENABLED`}, Update: []string{`DISABLED`}},
@@ -213,7 +213,7 @@ func TestOpsiDatabaseInsightResource_basic(t *testing.T) {
 				//resource.TestCheckResourceAttr(datasourceName, "database_id.#", "1"), // Won't be available for EM managed databases
 				resource.TestCheckResourceAttr(datasourceName, "database_type.#", "1"),
 				resource.TestCheckResourceAttrSet(datasourceName, "enterprise_manager_bridge_id"),
-				resource.TestCheckResourceAttr(datasourceName, "fields.#", "7"),
+				resource.TestCheckResourceAttr(datasourceName, "fields.#", "6"),
 				//resource.TestCheckResourceAttr(datasourceName, "id.#", "1"), // id is no more list. It is a string
 				resource.TestCheckResourceAttr(datasourceName, "state.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "status.#", "1"),
diff --git a/internal/integrationtest/opsi_exadata_insight_resource_test.go b/internal/integrationtest/opsi_exadata_insight_resource_test.go
@@ -17,8 +17,8 @@ var (
 	exadataInsightRequiredRepresentation = map[string]interface{}{
 		"compartment_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"enterprise_manager_bridge_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_bridge_id}`},
-		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_entity_id}`},
-		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_id}`},
+		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.em_exadata_enterprise_manager_entity_id}`},
+		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.em_exadata_enterprise_manager_id}`},
 		"status":                               acctest.Representation{RepType: acctest.Required, Create: `DISABLED`},
 		"entity_source":                        acctest.Representation{RepType: acctest.Required, Create: `EM_MANAGED_EXTERNAL_EXADATA`, Update: `EM_MANAGED_EXTERNAL_EXADATA`},
 		"defined_tags":                         acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`},
@@ -44,11 +44,11 @@ func TestOpsiResourceExadataInsight(t *testing.T) {
 	emBridgeId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_bridge_ocid")
 	emBridgeIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_bridge_id\" { default = \"%s\" }\n", emBridgeId)
 
-	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_id")
-	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
+	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("em_exadata_enterprise_manager_id")
+	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"em_exadata_enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
 
-	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_entity_id")
-	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
+	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("em_exadata_enterprise_manager_entity_id")
+	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"em_exadata_enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
 
 	resourceName := "oci_opsi_exadata_insight.test_exadata_insight"
 
diff --git a/internal/integrationtest/opsi_exadata_insight_test.go b/internal/integrationtest/opsi_exadata_insight_test.go
@@ -54,8 +54,8 @@ var (
 	exadataInsightRepresentation = map[string]interface{}{
 		"compartment_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"enterprise_manager_bridge_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_bridge_id}`},
-		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_entity_id}`},
-		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_id}`},
+		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.em_exadata_enterprise_manager_entity_id}`},
+		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.em_exadata_enterprise_manager_id}`},
 		"entity_source":                        acctest.Representation{RepType: acctest.Required, Create: `EM_MANAGED_EXTERNAL_EXADATA`, Update: `EM_MANAGED_EXTERNAL_EXADATA`},
 		"status":                               acctest.Representation{RepType: acctest.Optional, Create: `ENABLED`, Update: `DISABLED`},
 		"defined_tags":                         acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
@@ -87,11 +87,11 @@ func TestOpsiExadataInsightResource_basic(t *testing.T) {
 	emBridgeId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_bridge_ocid")
 	emBridgeIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_bridge_id\" { default = \"%s\" }\n", emBridgeId)
 
-	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_id")
-	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
+	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("em_exadata_enterprise_manager_id")
+	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"em_exadata_enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
 
-	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_entity_id")
-	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
+	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("em_exadata_enterprise_manager_entity_id")
+	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"em_exadata_enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
 
 	resourceName := "oci_opsi_exadata_insight.test_exadata_insight"
 	datasourceName := "data.oci_opsi_exadata_insights.test_exadata_insights"
diff --git a/internal/integrationtest/opsi_host_insight_em_host_resource_test.go b/internal/integrationtest/opsi_host_insight_em_host_resource_test.go
@@ -20,8 +20,8 @@ var (
 	emHostInsightRequiredRepresentation = map[string]interface{}{
 		"compartment_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"enterprise_manager_bridge_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_bridge_id}`},
-		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_entity_id}`},
-		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_id}`},
+		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.em_host_enterprise_manager_entity_id}`},
+		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.em_host_enterprise_manager_id}`},
 		"entity_source":                        acctest.Representation{RepType: acctest.Required, Create: `EM_MANAGED_EXTERNAL_HOST`, Update: `EM_MANAGED_EXTERNAL_HOST`},
 		"status":                               acctest.Representation{RepType: acctest.Required, Create: `DISABLED`},
 		"defined_tags":                         acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
@@ -49,11 +49,11 @@ func TestResourceOpsiEmHostInsight(t *testing.T) {
 	emBridgeId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_bridge_ocid")
 	emBridgeIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_bridge_id\" { default = \"%s\" }\n", emBridgeId)
 
-	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_id")
-	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
+	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("em_host_enterprise_manager_id")
+	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"em_host_enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
 
-	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_entity_id")
-	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
+	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("em_host_enterprise_manager_entity_id")
+	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"em_host_enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
 
 	resourceName := "oci_opsi_host_insight.test_host_insight"
 
diff --git a/internal/integrationtest/opsi_host_insight_em_host_test.go b/internal/integrationtest/opsi_host_insight_em_host_test.go
@@ -54,8 +54,8 @@ var (
 	emHostInsightRepresentation = map[string]interface{}{
 		"compartment_id":                       acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 		"enterprise_manager_bridge_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_bridge_id}`},
-		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_entity_id}`},
-		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.enterprise_manager_id}`},
+		"enterprise_manager_entity_identifier": acctest.Representation{RepType: acctest.Required, Create: `${var.em_host_enterprise_manager_entity_id}`},
+		"enterprise_manager_identifier":        acctest.Representation{RepType: acctest.Required, Create: `${var.em_host_enterprise_manager_id}`},
 		"entity_source":                        acctest.Representation{RepType: acctest.Required, Create: `EM_MANAGED_EXTERNAL_HOST`, Update: `EM_MANAGED_EXTERNAL_HOST`},
 		"status":                               acctest.Representation{RepType: acctest.Optional, Create: `ENABLED`, Update: `DISABLED`},
 		"defined_tags":                         acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
@@ -86,11 +86,11 @@ func TestOpsiEmHostInsightResource_basic(t *testing.T) {
 	emBridgeId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_bridge_ocid")
 	emBridgeIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_bridge_id\" { default = \"%s\" }\n", emBridgeId)
 
-	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_id")
-	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
+	enterpriseManagerId := utils.GetEnvSettingWithBlankDefault("em_host_enterprise_manager_id")
+	enterpriseManagerIdVariableStr := fmt.Sprintf("variable \"em_host_enterprise_manager_id\" { default = \"%s\" }\n", enterpriseManagerId)
 
-	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("enterprise_manager_entity_id")
-	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
+	enterpriseManagerEntityId := utils.GetEnvSettingWithBlankDefault("em_host_enterprise_manager_entity_id")
+	enterpriseManagerEntityIdVariableStr := fmt.Sprintf("variable \"em_host_enterprise_manager_entity_id\" { default = \"%s\" }\n", enterpriseManagerEntityId)
 
 	resourceName := "oci_opsi_host_insight.test_host_insight"
 	datasourceName := "data.oci_opsi_host_insights.test_host_insights"
diff --git a/internal/service/opsi/opsi_database_insight_resource.go b/internal/service/opsi/opsi_database_insight_resource.go
@@ -487,7 +487,7 @@ func (s *OpsiDatabaseInsightResourceCrud) Update() error {
 
 		// Wait until it finishes
 		databaseInsightId, err := databaseInsightWaitForWorkRequest(workId, "opsi",
-			oci_opsi.ActionTypeCreated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)
+			oci_opsi.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)
 		if err != nil {
 			return err
 		}
diff --git a/internal/service/opsi/opsi_host_insight_resource.go b/internal/service/opsi/opsi_host_insight_resource.go
@@ -502,7 +502,7 @@ func (s *OpsiHostInsightResourceCrud) Update() error {
 
 		// Wait until it finishes
 		hostInsightId, err := hostInsightWaitForWorkRequest(workId, "opsi",
-			oci_opsi.ActionTypeCreated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)
+			oci_opsi.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)
 		if err != nil {
 			return err
 		}
diff --git a/website/docs/d/opsi_host_insight.html.markdown b/website/docs/d/opsi_host_insight.html.markdown
@@ -49,7 +49,10 @@ The following attributes are exported:
 * `host_type` - Operations Insights internal representation of the host type. Possible value is EXTERNAL-HOST.
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the host insight resource.
 * `lifecycle_details` - A message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state.
-* `processor_count` - Processor count.
+* `platform_name` - Platform name.
+* `platform_type` - Platform type. Supported platformType(s) for MACS-managed external host insight: [LINUX]. Supported platformType(s) for EM-managed external host insight: [LINUX, SOLARIS, SUNOS]. 
+* `platform_version` - Platform version.
+* `processor_count` - Processor count. This is the OCPU count for Autonomous Database and CPU core count for other database types.
 * `state` - The current state of the host.
 * `status` - Indicates the status of a host insight in Operations Insights
 * `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"orcl-cloud.free-tier-retained": "true"}` 
diff --git a/website/docs/d/opsi_host_insights.html.markdown b/website/docs/d/opsi_host_insights.html.markdown
diff --git a/website/docs/r/opsi_host_insight.html.markdown b/website/docs/r/opsi_host_insight.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ variable "database_insight_entity_source" {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`variable "database_insight_fields" {`
`51`		`- default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags", "systemTags"]`
	`51`	`+ default = ["databaseName", "databaseType", "compartmentId", "databaseDisplayName", "freeformTags", "definedTags"]`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`variable "database_insight_freeform_tags" {`
Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ func (s *OpsiDatabaseInsightResourceCrud) Update() error {`
`487`	`487`
`488`	`488`	`// Wait until it finishes`
`489`	`489`	`databaseInsightId, err := databaseInsightWaitForWorkRequest(workId, "opsi",`
`490`		`- oci_opsi.ActionTypeCreated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)`
	`490`	`+ oci_opsi.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)`
`491`	`491`	`if err != nil {`
`492`	`492`	`return err`
`493`	`493`	`}`
Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ func (s *OpsiHostInsightResourceCrud) Update() error {`
`502`	`502`
`503`	`503`	`// Wait until it finishes`
`504`	`504`	`hostInsightId, err := hostInsightWaitForWorkRequest(workId, "opsi",`
`505`		`- oci_opsi.ActionTypeCreated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)`
	`505`	`+ oci_opsi.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries, s.Client)`
`506`	`506`	`if err != nil {`
`507`	`507`	`return err`
`508`	`508`	`}`