Merge branch 'rm-port-associated-vxc'

utilitywarehouse · Jan 31, 2020 · f1fbcac · f1fbcac
2 parents 193ea49 + de1e257
commit f1fbcac
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/megaport/resource_megaport_port.go b/megaport/resource_megaport_port.go
@@ -45,12 +45,6 @@ func resourceMegaportPort() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"associated_vxcs": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem:     resourceMegaportPrivateVxc(),
-				Set:      schema.HashResource(resourceMegaportPrivateVxc()),
-			},
 			"marketplace_visibility": resourceAttributePrivatePublic(),
 		},
 	}
@@ -79,9 +73,6 @@ func resourceMegaportPortRead(d *schema.ResourceData, m interface{}) error {
 	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
-	}
 	if err := d.Set("marketplace_visibility", "private"); err != nil {
 		return err
 	}
@@ -134,20 +125,3 @@ func resourceMegaportPortDelete(d *schema.ResourceData, m interface{}) error {
 	}
 	return nil
 }
-
-func flattenVxc(v api.ProductAssociatedVxc) interface{} {
-	return map[string]interface{}{
-		"name":       v.ProductName,
-		"rate_limit": int(v.RateLimit),
-		"a_end":      flattenVxcEnd(v.AEnd),
-		"b_end":      flattenVxcEnd(v.BEnd),
-	}
-}
-
-func flattenVxcList(vs []api.ProductAssociatedVxc) []interface{} {
-	ret := make([]interface{}, len(vs))
-	for i, v := range vs {
-		ret[i] = flattenVxc(v)
-	}
-	return ret
-}
diff --git a/megaport/resource_megaport_port_test.go b/megaport/resource_megaport_port_test.go
@@ -75,7 +75,6 @@ func TestAccMegaportPort_basic(t *testing.T) {
 					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"),
 				),
 			},
@@ -89,7 +88,6 @@ func TestAccMegaportPort_basic(t *testing.T) {
 					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"),
 				),
 			},
@@ -103,7 +101,6 @@ func TestAccMegaportPort_basic(t *testing.T) {
 					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"),
 				),
 			},

diff --git a/website/docs/r/port.html.md b/website/docs/r/port.html.md
@@ -47,4 +47,3 @@ will be listed on the Megaport Marketplace.
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The unique product id of the port.
-* `associated_vxcs` - A list of all the VXCs associated with this port.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,3 @@ will be listed on the Megaport Marketplace.
		In addition to all arguments above, the following attributes are exported:

		* `id` - The unique product id of the port.
		* `associated_vxcs` - A list of all the VXCs associated with this port.