Merge pull request #57 from oracle/gb/fix-sdk-pointer-issue

garthy · web-flow · commit c832ef732b97 · 2018-02-07T19:09:38.000Z
Fix SDK port pointer error
diff --git a/pkg/oci/client/oci.go b/pkg/oci/client/oci.go
@@ -187,7 +187,7 @@ func (c *client) getAllSubnetsForVNC() (*[]core.Subnet, error) {
 			return nil, err
 		}
 		subnets := r.Items
-		log.Printf("Subnets:%#v", subnets)
+
 		subnetList = append(subnetList, subnets...)
 		if page = r.OpcNextPage; r.OpcNextPage == nil {
 			break
@@ -198,7 +198,7 @@ func (c *client) getAllSubnetsForVNC() (*[]core.Subnet, error) {
 
 func (c *client) isVnicAttachmentInSubnets(vnicAttachment *core.VnicAttachment, subnets *[]core.Subnet) bool {
 	for _, subnet := range *subnets {
-		if vnicAttachment.SubnetId == subnet.Id {
+		if *vnicAttachment.SubnetId == *subnet.Id {
 			return true
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func (c client) getAllSubnetsForVNC() ([]core.Subnet, error) {`
`187`	`187`	`return nil, err`
`188`	`188`	`}`
`189`	`189`	`subnets := r.Items`
`190`		`- log.Printf("Subnets:%#v", subnets)`
	`190`	`+`
`191`	`191`	`subnetList = append(subnetList, subnets...)`
`192`	`192`	`if page = r.OpcNextPage; r.OpcNextPage == nil {`
`193`	`193`	`break`
`@@ -198,7 +198,7 @@ func (c client) getAllSubnetsForVNC() ([]core.Subnet, error) {`
`198`	`198`
`199`	`199`	`func (c client) isVnicAttachmentInSubnets(vnicAttachment core.VnicAttachment, subnets *[]core.Subnet) bool {`
`200`	`200`	`for _, subnet := range *subnets {`
`201`		`- if vnicAttachment.SubnetId == subnet.Id {`
	`201`	`+ if vnicAttachment.SubnetId == subnet.Id {`
`202`	`202`	`return true`
`203`	`203`	`}`
`204`	`204`	`}`