mirror of https://github.com/hashicorp/terraform
provider/openstack: Add support provider network (#10265)
* provider:openstack Add support provider network * revert vendor file changes * vendor: Updating Gophercloud for OpenStack Provider * create provider network if parameter has segments * segments is not computed resource * extract to generate []provider.Segment * change segmentstion id typepull/14916/head
Ryo Takaishi
9 years ago
committed by
Joe Topjian
parent
6d0f507175
commit
c501cb1063
@ -0,0 +1,21 @@
|
||||
// Package provider gives access to the provider Neutron plugin, allowing
|
||||
// network extended attributes. The provider extended attributes for networks
|
||||
// enable administrative users to specify how network objects map to the
|
||||
// underlying networking infrastructure. These extended attributes also appear
|
||||
// when administrative users query networks.
|
||||
//
|
||||
// For more information about extended attributes, see the NetworkExtAttrs
|
||||
// struct. The actual semantics of these attributes depend on the technology
|
||||
// back end of the particular plug-in. See the plug-in documentation and the
|
||||
// OpenStack Cloud Administrator Guide to understand which values should be
|
||||
// specific for each of these attributes when OpenStack Networking is deployed
|
||||
// with a particular plug-in. The examples shown in this chapter refer to the
|
||||
// Open vSwitch plug-in.
|
||||
//
|
||||
// The default policy settings enable only users with administrative rights to
|
||||
// specify these parameters in requests and to see their values in responses. By
|
||||
// default, the provider network extension attributes are completely hidden from
|
||||
// regular tenants. As a rule of thumb, if these attributes are not visible in a
|
||||
// GET /networks/<network-id> operation, this implies the user submitting the
|
||||
// request is not authorized to view or manipulate provider network attributes.
|
||||
package provider
|
||||
@ -0,0 +1,28 @@
|
||||
package provider
|
||||
|
||||
import (
|
||||
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
|
||||
)
|
||||
|
||||
// CreateOptsExt adds a Segments option to the base Network CreateOpts.
|
||||
type CreateOptsExt struct {
|
||||
networks.CreateOptsBuilder
|
||||
Segments []Segment `json:"segments,omitempty"`
|
||||
}
|
||||
|
||||
// ToNetworkCreateMap adds segments to the base network creation options.
|
||||
func (opts CreateOptsExt) ToNetworkCreateMap() (map[string]interface{}, error) {
|
||||
base, err := opts.CreateOptsBuilder.ToNetworkCreateMap()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if opts.Segments == nil {
|
||||
return base, nil
|
||||
}
|
||||
|
||||
providerMap := base["network"].(map[string]interface{})
|
||||
providerMap["segments"] = opts.Segments
|
||||
|
||||
return base, nil
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package provider
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
|
||||
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
|
||||
"github.com/gophercloud/gophercloud/pagination"
|
||||
)
|
||||
|
||||
// NetworkExtAttrs represents an extended form of a Network with additional fields.
|
||||
type NetworkExtAttrs struct {
|
||||
// UUID for the network
|
||||
ID string `json:"id"`
|
||||
|
||||
// Human-readable name for the network. Might not be unique.
|
||||
Name string `json:"name"`
|
||||
|
||||
// The administrative state of network. If false (down), the network does not forward packets.
|
||||
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 `json:"status"`
|
||||
|
||||
// Subnets associated with this network.
|
||||
Subnets []string `json:"subnets"`
|
||||
|
||||
// Owner of network. Only admin users can specify a tenant_id other than its own.
|
||||
TenantID string `json:"tenant_id"`
|
||||
|
||||
// Specifies whether the network resource can be accessed by any tenant or not.
|
||||
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"`
|
||||
|
||||
// Identifies the physical network on top of which this network object is
|
||||
// being implemented. The OpenStack Networking API does not expose any facility
|
||||
// for retrieving the list of available physical networks. As an example, in
|
||||
// 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"`
|
||||
|
||||
// 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"`
|
||||
|
||||
// Segments is an array of Segment which defines multiple physical bindings to logical networks.
|
||||
Segments []Segment `json:"segments"`
|
||||
}
|
||||
|
||||
// Segment defines a physical binding to a logical network.
|
||||
type Segment struct {
|
||||
PhysicalNetwork string `json:"provider:physical_network"`
|
||||
NetworkType string `json:"provider:network_type"`
|
||||
SegmentationID int `json:"provider:segmentation_id"`
|
||||
}
|
||||
|
||||
func (n *NetworkExtAttrs) UnmarshalJSON(b []byte) error {
|
||||
type tmp NetworkExtAttrs
|
||||
var networkExtAttrs *struct {
|
||||
tmp
|
||||
SegmentationID interface{} `json:"provider:segmentation_id"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(b, &networkExtAttrs); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*n = NetworkExtAttrs(networkExtAttrs.tmp)
|
||||
|
||||
switch t := networkExtAttrs.SegmentationID.(type) {
|
||||
case float64:
|
||||
n.SegmentationID = strconv.FormatFloat(t, 'f', -1, 64)
|
||||
case string:
|
||||
n.SegmentationID = string(t)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ExtractGet decorates a GetResult struct returned from a networks.Get()
|
||||
// function with extended attributes.
|
||||
func ExtractGet(r networks.GetResult) (*NetworkExtAttrs, error) {
|
||||
var s struct {
|
||||
Network *NetworkExtAttrs `json:"network"`
|
||||
}
|
||||
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) {
|
||||
var s struct {
|
||||
Network *NetworkExtAttrs `json:"network"`
|
||||
}
|
||||
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) {
|
||||
var s struct {
|
||||
Network *NetworkExtAttrs `json:"network"`
|
||||
}
|
||||
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(r pagination.Page) ([]NetworkExtAttrs, error) {
|
||||
var s struct {
|
||||
Networks []NetworkExtAttrs `json:"networks" json:"networks"`
|
||||
}
|
||||
err := (r.(networks.NetworkPage)).ExtractInto(&s)
|
||||
return s.Networks, err
|
||||
}
|
||||
Loading…
Reference in new issue