Support local dns to instance, vcn and subnet

ccushing · ccushing · commit b0191bc6117a · 2017-04-06T20:10:15.000-07:00
* fixes typo: VirtualRouterID -&gt; VirtualRouterIP
diff --git a/client/bare_metal_client.go b/client/bare_metal_client.go
@@ -28,7 +28,7 @@ type BareMetalClient interface {
 	CreateSubnet(availabilityDomain, cidrBlock, compartmentID, vcnID string, opts *baremetal.CreateSubnetOptions) (sn *baremetal.Subnet, e error)
 	CreateSwiftPassword(userID, desc string, opts *baremetal.RetryTokenOptions) (res *baremetal.SwiftPassword, e error)
 	CreateUser(name, desc string, opts *baremetal.RetryTokenOptions) (res *baremetal.User, e error)
-	CreateVirtualNetwork(cidrBlock, compartmentID string, opts *baremetal.CreateOptions) (vcn *baremetal.VirtualNetwork, e error)
+	CreateVirtualNetwork(cidrBlock, compartmentID string, opts *baremetal.CreateVcnOptions) (vcn *baremetal.VirtualNetwork, e error)
 	CreateVolume(availabilityDomain, compartmentID string, opts *baremetal.CreateVolumeOptions) (res *baremetal.Volume, e error)
 	CreateVolumeBackup(volumeID string, opts *baremetal.CreateOptions) (vol *baremetal.VolumeBackup, e error)
 
diff --git a/client/mocks/bare_metal_client.go b/client/mocks/bare_metal_client.go
@@ -470,11 +470,11 @@ func (_m *BareMetalClient) CreateUser(name string, desc string, opts *baremetal.
 }
 
 // CreateVirtualNetwork provides a mock function with given fields: cidrBlock, compartmentID, opts
-func (_m *BareMetalClient) CreateVirtualNetwork(cidrBlock string, compartmentID string, opts *baremetal.CreateOptions) (*baremetal.VirtualNetwork, error) {
+func (_m *BareMetalClient) CreateVirtualNetwork(cidrBlock string, compartmentID string, opts *baremetal.CreateVcnOptions) (*baremetal.VirtualNetwork, error) {
 	ret := _m.Called(cidrBlock, compartmentID, opts)
 
 	var r0 *baremetal.VirtualNetwork
-	if rf, ok := ret.Get(0).(func(string, string, *baremetal.CreateOptions) *baremetal.VirtualNetwork); ok {
+	if rf, ok := ret.Get(0).(func(string, string, *baremetal.CreateVcnOptions) *baremetal.VirtualNetwork); ok {
 		r0 = rf(cidrBlock, compartmentID, opts)
 	} else {
 		if ret.Get(0) != nil {
@@ -483,7 +483,7 @@ func (_m *BareMetalClient) CreateVirtualNetwork(cidrBlock string, compartmentID
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(string, string, *baremetal.CreateOptions) error); ok {
+	if rf, ok := ret.Get(1).(func(string, string, *baremetal.CreateVcnOptions) error); ok {
 		r1 = rf(cidrBlock, compartmentID, opts)
 	} else {
 		r1 = ret.Error(1)
diff --git a/core/instance_resource.go b/core/instance_resource.go
@@ -30,6 +30,11 @@ func InstanceResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"hostname_label": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"id": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/core/instance_resource_crud.go b/core/instance_resource_crud.go
@@ -60,6 +60,9 @@ func (s *InstanceResourceCrud) Create() (e error) {
 	if displayName, ok := s.D.GetOk("display_name"); ok {
 		opts.DisplayName = displayName.(string)
 	}
+	if hostnameLabel, ok := s.D.GetOk("hostname_label"); ok {
+		opts.HostnameLabel = hostnameLabel.(string)
+	}
 
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
 		metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))
diff --git a/core/subnet_datasource.go b/core/subnet_datasource.go
@@ -83,7 +83,7 @@ func resourceCoreSubnets() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"virtual_router_id": {
+			"virtual_router_ip": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/core/subnet_datasource_crud.go b/core/subnet_datasource_crud.go
@@ -59,7 +59,7 @@ func (s *SubnetDatasourceCrud) SetData() {
 				"id":                  v.ID,
 				"state":               v.State,
 				"time_created":        v.TimeCreated.String(),
-				"virtual_router_id":   v.VirtualRouterID,
+				"virtual_router_ip":   v.VirtualRouterIP,
 				"virtual_router_mac":  v.VirtualRouterMac,
 			}
 			resources = append(resources, res)
diff --git a/core/subnet_resource.go b/core/subnet_resource.go
@@ -53,6 +53,11 @@ func SubnetResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"dns_label": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -65,7 +70,7 @@ func SubnetResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"virtual_router_id": {
+			"virtual_router_ip": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
diff --git a/core/subnet_resource_crud.go b/core/subnet_resource_crud.go
@@ -50,6 +50,11 @@ func (s *SubnetResourceCrud) Create() (e error) {
 		opts.DisplayName = displayName.(string)
 	}
 
+	dnsLabel, ok := s.D.GetOk("dns_label")
+	if ok {
+		opts.DNSLabel = dnsLabel.(string)
+	}
+
 	if rawSecurityListIDs, ok := s.D.GetOk("security_list_ids"); ok {
 		securityListIDs := []string{}
 		for _, val := range rawSecurityListIDs.([]interface{}) {
@@ -94,13 +99,14 @@ func (s *SubnetResourceCrud) SetData() {
 	s.D.Set("availability_domain", s.Resource.AvailabilityDomain)
 	s.D.Set("compartment_id", s.Resource.CompartmentID)
 	s.D.Set("display_name", s.Resource.DisplayName)
+	s.D.Set("dns_label", s.Resource.DNSLabel)
 	s.D.Set("cidr_block", s.Resource.CIDRBlock)
 	s.D.Set("route_table_id", s.Resource.RouteTableID)
 	s.D.Set("vcn_id", s.Resource.VcnID)
 	s.D.Set("security_list_ids", s.Resource.SecurityListIDs)
 	s.D.Set("state", s.Resource.State)
 	s.D.Set("time_created", s.Resource.TimeCreated.String())
-	s.D.Set("virtual_router_id", s.Resource.VirtualRouterID)
+	s.D.Set("virtual_router_ip", s.Resource.VirtualRouterIP)
 	s.D.Set("virtual_router_mac", s.Resource.VirtualRouterMac)
 }
 
diff --git a/core/virtual_network_resource.go b/core/virtual_network_resource.go
@@ -38,6 +38,11 @@ func VirtualNetworkResource() *schema.Resource {
 				Computed: true,
 				Optional: true,
 			},
+			"dns_label": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+			},
 			"id": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/core/virtual_network_resource_crud.go b/core/virtual_network_resource_crud.go
@@ -36,12 +36,17 @@ func (s *VirtualNetworkResourceCrud) Create() (e error) {
 	cidrBlock := s.D.Get("cidr_block").(string)
 	compartmentID := s.D.Get("compartment_id").(string)
 
-	opts := &baremetal.CreateOptions{}
+	opts := &baremetal.CreateVcnOptions{}
 	displayName, ok := s.D.GetOk("display_name")
 	if ok {
 		opts.DisplayName = displayName.(string)
 	}
 
+	dnsLabel, ok := s.D.GetOk("dns_label")
+	if ok {
+		opts.DnsLabel = dnsLabel.(string)
+	}
+
 	s.Res, e = s.Client.CreateVirtualNetwork(cidrBlock, compartmentID, opts)
 
 	return
diff --git a/core_subnet_datasource_test.go b/core_subnet_datasource_test.go
@@ -70,7 +70,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnets() {
 						Time: time.Now(),
 					},
 					VcnID:            "vcnid",
-					VirtualRouterID:  "virtualrouterid",
+					VirtualRouterIP:  "virtualrouterip",
 					VirtualRouterMac: "virtualroutermac",
 				},
 				{
@@ -89,7 +89,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnets() {
 						Time: time.Now(),
 					},
 					VcnID:            "vcnid",
-					VirtualRouterID:  "virtualrouterid",
+					VirtualRouterIP:  "virtualrouterip",
 					VirtualRouterMac: "virtualroutermac",
 				},
 			},
@@ -141,7 +141,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnetsWithPagination() {
 				Time: time.Now(),
 			},
 			VcnID:            "vcnid",
-			VirtualRouterID:  "virtualrouterid",
+			VirtualRouterIP:  "virtualrouterip",
 			VirtualRouterMac: "virtualroutermac",
 		},
 		{
@@ -160,7 +160,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnetsWithPagination() {
 				Time: time.Now(),
 			},
 			VcnID:            "vcnid",
-			VirtualRouterID:  "virtualrouterid",
+			VirtualRouterIP:  "virtualrouterip",
 			VirtualRouterMac: "virtualroutermac",
 		},
 	}
@@ -198,7 +198,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnetsWithPagination() {
 						Time: time.Now(),
 					},
 					VcnID:            "vcnid",
-					VirtualRouterID:  "virtualrouterid",
+					VirtualRouterIP:  "virtualrouterip",
 					VirtualRouterMac: "virtualroutermac",
 				},
 				{
@@ -217,7 +217,7 @@ func (s *ResourceCoreSubnetsTestSuite) TestResourceListSubnetsWithPagination() {
 						Time: time.Now(),
 					},
 					VcnID:            "vcnid",
-					VirtualRouterID:  "virtualrouterid",
+					VirtualRouterIP:  "virtualrouterip",
 					VirtualRouterMac: "virtualroutermac",
 				},
 			},
diff --git a/core_subnet_test.go b/core_subnet_test.go
@@ -73,7 +73,7 @@ func (s *ResourceCoreSubnetTestSuite) SetupTest() {
 			Time: time.Now(),
 		},
 		VcnID:            "vcnid",
-		VirtualRouterID:  "virtualrouterid",
+		VirtualRouterIP:  "virtualrouterip",
 		VirtualRouterMac: "virtualroutermac",
 	}
 
@@ -191,7 +191,7 @@ func (s ResourceCoreSubnetTestSuite) TestUpdateCompartmentIDForcesNewSubnet() {
 			Time: time.Now(),
 		},
 		VcnID:            "vcnid",
-		VirtualRouterID:  "virtualrouterid",
+		VirtualRouterIP:  "virtualrouterip",
 		VirtualRouterMac: "virtualroutermac",
 	}
 	delRes := &baremetal.Subnet{}
diff --git a/core_virtual_network_test.go b/core_virtual_network_test.go
@@ -93,7 +93,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
 	s.DeletedRes.ETag = "etag"
 	s.DeletedRes.RequestID = "opcrequestid"
 
-	opts := &baremetal.CreateOptions{}
+	opts := &baremetal.CreateVcnOptions{}
 	opts.DisplayName = "display_name"
 	s.Client.On(
 		"CreateVirtualNetwork",
@@ -163,7 +163,7 @@ func (s *ResourceCoreVirtualNetworkTestSuite) TestCreateResourceCoreVirtualNetwo
 	`
 	s.Config += testProviderConfig
 
-	opts := &baremetal.CreateOptions{}
+	opts := &baremetal.CreateVcnOptions{}
 	s.Client.On(
 		"CreateVirtualNetwork",
 		"cidr_block",
@@ -211,7 +211,7 @@ func (s ResourceCoreVirtualNetworkTestSuite) TestUpdateCidrBlockForcesNewVirtual
 
 	// Step 2 creates a new resource and then uses the same Get pattern from
 	// above in order to delete, this time with the newly created resource.
-	opts := &baremetal.CreateOptions{}
+	opts := &baremetal.CreateVcnOptions{}
 	s.Client.On(
 		"CreateVirtualNetwork",
 		res.CidrBlock,
diff --git a/docs/examples/compute/single-instance/compute.tf b/docs/examples/compute/single-instance/compute.tf
@@ -2,6 +2,7 @@ resource "baremetal_core_instance" "TFInstance" {
   availability_domain = "${lookup(data.baremetal_identity_availability_domains.ADs.availability_domains[var.AD - 1],"name")}" 
   compartment_id = "${var.compartment_ocid}"
   display_name = "TFInstance"
+  hostname_label = "instance1"
   image = "${lookup(data.baremetal_core_images.OLImageOCID.images[0], "id")}"
   shape = "${var.InstanceShape}"
   subnet_id = "${var.SubnetOCID}"
diff --git a/docs/examples/network/simple_vcn/vcn.tf b/docs/examples/network/simple_vcn/vcn.tf
@@ -13,6 +13,7 @@ provider "baremetal" {
 
 resource "baremetal_core_virtual_network" "a_TF_managed_VCN" {
   cidr_block = "10.0.0.0/16"
+  dns_label = "vnc1"
   compartment_id = "${var.compartment_ocid}"
   display_name = "a_TF_managed_VCN"
 }
diff --git a/docs/examples/network/single_subnet/subnet.tf b/docs/examples/network/single_subnet/subnet.tf
@@ -15,13 +15,14 @@ provider "baremetal" {
 Because you can specify multiple security lists/subnet the security_list_ids value must be specified as a list in []'s.
  See https://www.terraform.io/docs/configuration/syntax.html
    
-Generally you wouldn't specify a subnet without first specifying a VNC. Once the VNC has been created you would get the vcn_id, route_table_id, and security_list_id(s) from that resource and use Terraform attributes below to populate those values. 
+Generally you wouldn't specify a subnet without first specifying a VCN. Once the VCN has been created you would get the vcn_id, route_table_id, and security_list_id(s) from that resource and use Terraform attributes below to populate those values.
    See https://www.terraform.io/docs/configuration/interpolation.html*/
 
 resource "baremetal_core_subnet" "a_TF_managed_subnet" {
   availability_domain = "Ucom:PHX-AD-1"
   cidr_block = "10.0.1.0/24"
   display_name = "a_TF_managed_subnet"
+  dns_label = "subnet1"
   compartment_id = "${var.compartment_ocid}"
   vcn_id = "ocid1.vcn.oc1.phx.aaaaaaaabf63x.........jzj2jfxsq"
   route_table_id = "ocid1.routetable.oc1.phx.aaa.........aaaauoaq"
diff --git a/vendor/github.com/MustWin/baremetal-sdk-go/core_subnet.go b/vendor/github.com/MustWin/baremetal-sdk-go/core_subnet.go
diff --git a/vendor/github.com/MustWin/baremetal-sdk-go/core_virtual_network.go b/vendor/github.com/MustWin/baremetal-sdk-go/core_virtual_network.go
diff --git a/vendor/github.com/MustWin/baremetal-sdk-go/request_options.go b/vendor/github.com/MustWin/baremetal-sdk-go/request_options.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -315,10 +315,10 @@
 			"revisionTime": "2017-02-01T00:43:30Z"
 		},
 		{
-			"checksumSHA1": "7GKnXxA76DCy9yAEfb4TtTHSCmw=",
+			"checksumSHA1": "iQeewNH9r06wDEBjVVUEAksGxlI=",
 			"path": "github.com/MustWin/baremetal-sdk-go",
-			"revision": "1a01267edea6079aa1311d09e1f53a5c924a7ce0",
-			"revisionTime": "2017-04-02T00:38:36Z"
+			"revision": "c63f99f400648cda8b9bb93b4a10ac89276307ad",
+			"revisionTime": "2017-04-07T01:02:09Z"
 		},
 		{
 			"checksumSHA1": "Aqy8/FoAIidY/DeQ5oTYSZ4YFVc=",

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ func (s *InstanceResourceCrud) Create() (e error) {`
`60`	`60`	`if displayName, ok := s.D.GetOk("display_name"); ok {`
`61`	`61`	`opts.DisplayName = displayName.(string)`
`62`	`62`	`}`
	`63`	`+ if hostnameLabel, ok := s.D.GetOk("hostname_label"); ok {`
	`64`	`+ opts.HostnameLabel = hostnameLabel.(string)`
	`65`	`+ }`
`63`	`66`
`64`	`67`	`if rawMetadata, ok := s.D.GetOk("metadata"); ok {`
`65`	`68`	`metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (s *SubnetDatasourceCrud) SetData() {`
`59`	`59`	`"id": v.ID,`
`60`	`60`	`"state": v.State,`
`61`	`61`	`"time_created": v.TimeCreated.String(),`
`62`		`- "virtual_router_id": v.VirtualRouterID,`
	`62`	`+ "virtual_router_ip": v.VirtualRouterIP,`
`63`	`63`	`"virtual_router_mac": v.VirtualRouterMac,`
`64`	`64`	`}`
`65`	`65`	`resources = append(resources, res)`