Merge branch 'extend-tests'

examples/megaport_aws_vxc_basic/main.tf

@@ -8,24 +8,24 @@ data "megaport_partner_port" "aws" {
   location_id  = data.megaport_location.aws.id
 }
 
-data "megaport_location" "port" {
+data "megaport_location" "foo" {
   name_regex = "Telehouse North"
 }
 
-resource "megaport_port" "port" {
+resource "megaport_port" "foo" {
   name        = "terraform_acctest_{{ .uid }}"
-  location_id = data.megaport_location.port.id
+  location_id = data.megaport_location.foo.id
   speed       = 1000
   term        = 1
 }
 
-resource "megaport_aws_vxc" "test" {
+resource "megaport_aws_vxc" "foo" {
   name              = "terraform_acctest_{{ .uid }}"
   rate_limit        = 100
   invoice_reference = "terraform_acctest_ref_{{ .uid }}"
 
   a_end {
-    product_uid = megaport_port.port.id
+    product_uid = megaport_port.foo.id
   }
 
   b_end {

examples/megaport_port_basic/main.tf

@@ -1,10 +1,10 @@
-data "megaport_location" "port" {
+data "megaport_location" "foo" {
   name_regex = "{{ .location }}"
 }
 
-resource "megaport_port" "test" {
+resource "megaport_port" "foo" {
   name        = "terraform_acctest_{{ .uid }}"
-  location_id = data.megaport_location.port.id
+  location_id = data.megaport_location.foo.id
   speed       = 1000
   term        = 1
 }

examples/megaport_port_basic_forcenew/main.tf

@@ -0,0 +1,13 @@
+data "megaport_location" "foo" {
+  name_regex = "{{ .location }}"
+}
+
+resource "megaport_port" "foo" {
+  name                   = "terraform_acctest_{{ .uid }}"
+  location_id            = data.megaport_location.foo.id
+  speed                  = 10000
+  term                   = 12
+  invoice_reference      = "{{ .uid }}"
+  marketplace_visibility = "public"
+}
+

examples/megaport_port_basic_update/main.tf

@@ -0,0 +1,13 @@
+data "megaport_location" "foo" {
+  name_regex = "{{ .location }}"
+}
+
+resource "megaport_port" "foo" {
+  name                   = "terraform_acctest_{{ .uid }}"
+  location_id            = data.megaport_location.foo.id
+  speed                  = 1000
+  term                   = 1
+  invoice_reference      = "{{ .uid }}"
+  marketplace_visibility = "public"
+}
+

megaport/api/port.go

@@ -18,7 +18,8 @@ const (
 // mcr2: virtual = false, type = MCR2
 
 type portCreatePayload struct {
-	CreateDate            *uint64 `json:"createDate,omitempty"`   // TODO: need to fill in? :o
+	CreateDate            *uint64 `json:"createDate,omitempty"` // TODO: need to fill in? :o
+	CostCentre            *string `json:"costCentre"`
 	LagPortCount          *uint64 `json:"lagPortCount,omitempty"` // TODO: Required: the number of ports in this LAG order (https://dev.megaport.com/#standard-api-orders-validate-lag-order)
 	LocationId            *uint64 `json:"locationId"`
 	LocationUid           *string `json:"locationUid,omitempty"` // TODO: null in example, is it a string? https://dev.megaport.com/#standard-api-orders-validate-port-order
@@ -44,6 +45,7 @@ type PortCreateInput struct {
 	Name                  *string
 	Speed                 *uint64
 	Term                  *uint64
+	InvoiceReference      *string
 }
 
 func (v *PortCreateInput) productType() string {
@@ -53,6 +55,7 @@ func (v *PortCreateInput) productType() string {
 func (v *PortCreateInput) toPayload() ([]byte, error) {
 	payload := []*portCreatePayload{{
 		LocationId:            v.LocationId,
+		CostCentre:            v.InvoiceReference,
 		PortSpeed:             v.Speed,
 		ProductName:           v.Name,
 		ProductType:           String(ProductTypePort), // TODO

megaport/api/types.go

@@ -102,6 +102,7 @@ type Product struct {
 	ContractStartDate  uint64
 	ContractEndDate    uint64
 	ContractTermMonths uint64
+	CostCentre         string
 	CreateDate         uint64
 	CreatedBy          string
 	// LagId // TODO: haven't seen a value other than null

megaport/common_test.go

@@ -124,10 +124,10 @@ func testAccGetConfig(name string, values map[string]interface{}) (string, error
 	return cfg.String(), nil
 }
 
-func testAccLogConfig(cfg string) {
+func testAccLogConfig(step int, cfg string) {
 	l := strings.Split(cfg, "\n")
 	for i := range l {
 		l[i] = "      " + l[i]
 	}
-	fmt.Printf("+++ CONFIG:\n%s\n", strings.Join(l, "\n"))
+	fmt.Printf("+++ CONFIG (step %d):\n%s\n", step, strings.Join(l, "\n"))
 }

megaport/resource_megaport_aws_vxc_test.go

@@ -23,7 +23,7 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	testAccLogConfig(cfg)
+	testAccLogConfig(0, cfg)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -33,8 +33,8 @@ func TestAccMegaportAwsVxc_basic(t *testing.T) {
 			{
 				Config: cfg,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckResourceExists("megaport_port.port", &vxcBefore),
-					testAccCheckResourceExists("megaport_aws_vxc.test", &vxcBefore),
+					testAccCheckResourceExists("megaport_port.foo", &vxcBefore),
+					testAccCheckResourceExists("megaport_aws_vxc.foo", &vxcBefore),
 				),
 			},
 		},

megaport/resource_megaport_port.go

@@ -31,10 +31,12 @@ func resourceMegaportPort() *schema.Resource {
 			"speed": {
 				Type:     schema.TypeInt,
 				Required: true,
+				ForceNew: true,
 			},
 			"term": {
 				Type:     schema.TypeInt,
 				Required: true,
+				ForceNew: true,
 			},
 			"invoice_reference": {
 				Type:     schema.TypeString,
@@ -48,7 +50,6 @@ func resourceMegaportPort() *schema.Resource {
 				Set:      schema.HashResource(resourceMegaportPrivateVxc()),
 			},
 			"marketplace_visibility": resourceAttributePrivatePublic(),
-			// TODO: LAG ports
 		},
 	}
 }
@@ -73,6 +74,9 @@ func resourceMegaportPortRead(d *schema.ResourceData, m interface{}) error {
 	if err := d.Set("term", p.ContractTermMonths); err != nil {
 		return err
 	}
+	if err := d.Set("invoice_reference", p.CostCentre); err != nil {
+		return err
+	}
 	if err := d.Set("associated_vxcs", schema.NewSet(schema.HashResource(resourceMegaportPrivateVxc()), flattenVxcList(p.AssociatedVxcs))); err != nil {
 		return err
 	}
@@ -84,7 +88,6 @@ func resourceMegaportPortRead(d *schema.ResourceData, m interface{}) error {
 			return err
 		}
 	}
-	//d.Set("invoice_reference", p.) // TODO: is this even exported?
 	return nil
 }
 
@@ -96,6 +99,7 @@ func resourceMegaportPortCreate(d *schema.ResourceData, m interface{}) error {
 		Name:                  api.String(d.Get("name")),
 		Speed:                 api.Uint64FromInt(d.Get("speed")),
 		Term:                  api.Uint64FromInt(d.Get("term")),
+		InvoiceReference:      api.String(d.Get("invoice_reference")),
 	})
 	if err != nil {
 		return err
@@ -107,10 +111,10 @@ func resourceMegaportPortCreate(d *schema.ResourceData, m interface{}) error {
 func resourceMegaportPortUpdate(d *schema.ResourceData, m interface{}) error {
 	cfg := m.(*Config)
 	if err := cfg.Client.UpdatePort(&api.PortUpdateInput{
-		InvoiceReference: api.String(d.Get("invoice_reference")),
-		Name:             api.String(d.Get("name")),
-		ProductUid:       api.String(d.Id()),
-		//RateLimit:        api.Uint64FromInt(d.Get("rate_limit")),
+		InvoiceReference:      api.String(d.Get("invoice_reference")),
+		Name:                  api.String(d.Get("name")),
+		ProductUid:            api.String(d.Id()),
+		MarketplaceVisibility: api.Bool(d.Get("marketplace_visibility") == "public"),
 	}); err != nil {
 		return err
 	}

megaport/resource_megaport_port_test.go

@@ -9,17 +9,28 @@ import (
 )
 
 func TestAccMegaportPort_basic(t *testing.T) {
-	var portBefore api.Product
+	var port, portUpdated, portNew api.Product
 	rName := "t" + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
-
-	cfg, err := testAccGetConfig("megaport_port_basic", map[string]interface{}{
+	configValues := map[string]interface{}{
 		"uid":      rName,
 		"location": "Telehouse North",
-	})
+	}
+
+	cfg, err := testAccGetConfig("megaport_port_basic", configValues)
 	if err != nil {
 		t.Fatal(err)
 	}
-	testAccLogConfig(cfg)
+	testAccLogConfig(0, cfg)
+	cfgUpdate, err := testAccGetConfig("megaport_port_basic_update", configValues)
+	if err != nil {
+		t.Fatal(err)
+	}
+	testAccLogConfig(1, cfgUpdate)
+	cfgForceNew, err := testAccGetConfig("megaport_port_basic_forcenew", configValues)
+	if err != nil {
+		t.Fatal(err)
+	}
+	testAccLogConfig(2, cfgForceNew)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -29,9 +40,49 @@ func TestAccMegaportPort_basic(t *testing.T) {
 			{
 				Config: cfg,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckResourceExists("megaport_port.test", &portBefore),
+					testAccCheckResourceExists("megaport_port.foo", &port),
+					resource.TestCheckResourceAttr("megaport_port.foo", "name", "terraform_acctest_"+rName),
+					resource.TestCheckResourceAttr("megaport_port.foo", "speed", "1000"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "term", "1"),
+					resource.TestCheckResourceAttrPair("megaport_port.foo", "location_id", "data.megaport_location.foo", "id"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "invoice_reference", ""),
+					resource.TestCheckNoResourceAttr("megaport_port.foo", "associated_vxcs"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "marketplace_visibility", "private"),
+				),
+			},
+			{
+				Config: cfgUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckResourceExists("megaport_port.foo", &portUpdated),
+					resource.TestCheckResourceAttr("megaport_port.foo", "name", "terraform_acctest_"+rName),
+					resource.TestCheckResourceAttr("megaport_port.foo", "speed", "1000"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "term", "1"),
+					resource.TestCheckResourceAttrPair("megaport_port.foo", "location_id", "data.megaport_location.foo", "id"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "invoice_reference", rName),
+					resource.TestCheckNoResourceAttr("megaport_port.foo", "associated_vxcs"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "marketplace_visibility", "public"),
+				),
+			},
+			{
+				Config: cfgForceNew,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckResourceExists("megaport_port.foo", &portNew),
+					resource.TestCheckResourceAttr("megaport_port.foo", "name", "terraform_acctest_"+rName),
+					resource.TestCheckResourceAttr("megaport_port.foo", "speed", "10000"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "term", "12"),
+					resource.TestCheckResourceAttrPair("megaport_port.foo", "location_id", "data.megaport_location.foo", "id"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "invoice_reference", rName),
+					resource.TestCheckNoResourceAttr("megaport_port.foo", "associated_vxcs"),
+					resource.TestCheckResourceAttr("megaport_port.foo", "marketplace_visibility", "public"),
 				),
 			},
 		},
 	})
+
+	if port.ProductUid != portUpdated.ProductUid {
+		t.Errorf("TestAccMegaportPort_basic: expected the port to be updated but the resource ids differ")
+	}
+	if port.ProductUid == portNew.ProductUid {
+		t.Errorf("TestAccMegaportPort_basic: expected the port to be recreated but the resource ids are identical")
+	}
 }