remove mapstructure from identity,networking,objectstorage,orchestration,pagination
diff --git a/openstack/networking/v2/extensions/provider/results.go b/openstack/networking/v2/extensions/provider/results.go
index 9590ae5..f437461 100755
--- a/openstack/networking/v2/extensions/provider/results.go
+++ b/openstack/networking/v2/extensions/provider/results.go
@@ -1,7 +1,6 @@
package provider
import (
- "github.com/mitchellh/mapstructure"
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
"github.com/gophercloud/gophercloud/pagination"
)
@@ -22,30 +21,30 @@
// NetworkExtAttrs represents an extended form of a Network with additional fields.
type NetworkExtAttrs struct {
// UUID for the network
- ID string `mapstructure:"id" json:"id"`
+ ID string `json:"id"`
// Human-readable name for the network. Might not be unique.
- Name string `mapstructure:"name" json:"name"`
+ Name string `json:"name"`
// The administrative state of network. If false (down), the network does not forward packets.
- AdminStateUp bool `mapstructure:"admin_state_up" json:"admin_state_up"`
+ AdminStateUp bool `json:"admin_state_up"`
// Indicates whether network is currently operational. Possible values include
// `ACTIVE', `DOWN', `BUILD', or `ERROR'. Plug-ins might define additional values.
- Status string `mapstructure:"status" json:"status"`
+ Status string `json:"status"`
// Subnets associated with this network.
- Subnets []string `mapstructure:"subnets" json:"subnets"`
+ Subnets []string `json:"subnets"`
// Owner of network. Only admin users can specify a tenant_id other than its own.
- TenantID string `mapstructure:"tenant_id" json:"tenant_id"`
+ TenantID string `json:"tenant_id"`
// Specifies whether the network resource can be accessed by any tenant or not.
- Shared bool `mapstructure:"shared" json:"shared"`
+ Shared bool `json:"shared"`
// Specifies the nature of the physical network mapped to this network
// resource. Examples are flat, vlan, or gre.
- NetworkType string `json:"provider:network_type" mapstructure:"provider:network_type"`
+ NetworkType string `json:"provider:network_type"`
// Identifies the physical network on top of which this network object is
// being implemented. The OpenStack Networking API does not expose any facility
@@ -53,72 +52,53 @@
// the Open vSwitch plug-in this is a symbolic name which is then mapped to
// specific bridges on each compute host through the Open vSwitch plug-in
// configuration file.
- PhysicalNetwork string `json:"provider:physical_network" mapstructure:"provider:physical_network"`
+ PhysicalNetwork string `json:"provider:physical_network"`
// Identifies an isolated segment on the physical network; the nature of the
// segment depends on the segmentation model defined by network_type. For
// instance, if network_type is vlan, then this is a vlan identifier;
// otherwise, if network_type is gre, then this will be a gre key.
- SegmentationID string `json:"provider:segmentation_id" mapstructure:"provider:segmentation_id"`
+ SegmentationID string `json:"provider:segmentation_id"`
}
// ExtractGet decorates a GetResult struct returned from a networks.Get()
// function with extended attributes.
func ExtractGet(r networks.GetResult) (*NetworkExtAttrs, error) {
- if r.Err != nil {
- return nil, r.Err
- }
-
- var res struct {
+ var s struct {
Network *NetworkExtAttrs `json:"network"`
}
-
- err := mapstructure.WeakDecode(r.Body, &res)
-
- return res.Network, err
+ err := r.ExtractInto(&s)
+ return s.Network, err
}
// ExtractCreate decorates a CreateResult struct returned from a networks.Create()
// function with extended attributes.
func ExtractCreate(r networks.CreateResult) (*NetworkExtAttrs, error) {
- if r.Err != nil {
- return nil, r.Err
- }
-
- var res struct {
+ var s struct {
Network *NetworkExtAttrs `json:"network"`
}
-
- err := mapstructure.WeakDecode(r.Body, &res)
-
- return res.Network, err
+ err := r.ExtractInto(&s)
+ return s.Network, err
}
// ExtractUpdate decorates a UpdateResult struct returned from a
// networks.Update() function with extended attributes.
func ExtractUpdate(r networks.UpdateResult) (*NetworkExtAttrs, error) {
- if r.Err != nil {
- return nil, r.Err
- }
-
- var res struct {
+ var s struct {
Network *NetworkExtAttrs `json:"network"`
}
-
- err := mapstructure.WeakDecode(r.Body, &res)
-
- return res.Network, err
+ err := r.ExtractInto(&s)
+ return s.Network, err
}
// ExtractList accepts a Page struct, specifically a NetworkPage struct, and
// extracts the elements into a slice of NetworkExtAttrs structs. In other
// words, a generic collection is mapped into a relevant slice.
func ExtractList(page pagination.Page) ([]NetworkExtAttrs, error) {
- var resp struct {
- Networks []NetworkExtAttrs `mapstructure:"networks" json:"networks"`
+ r := page.(networks.NetworkPage)
+ var s struct {
+ Networks []NetworkExtAttrs `json:"networks" json:"networks"`
}
-
- err := mapstructure.WeakDecode(page.(networks.NetworkPage).Body, &resp)
-
- return resp.Networks, err
+ err := r.ExtractInto(&s)
+ return s.Networks, err
}