From 43a8028f4f44a0a658b19fec10f269aee2ebaa0a Mon Sep 17 00:00:00 2001 From: zhouhaibing089 Date: Sat, 8 Apr 2017 21:50:23 +0800 Subject: [PATCH] openstack: remove field flavor_to_resource Change-Id: I51f3f764fea17c48b0dfc2df25bb7ed3be9830ea --- openstack/openstack_instances.go | 35 ++------------------------------ 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/openstack/openstack_instances.go b/openstack/openstack_instances.go index cb64ed5..3d4f749 100644 --- a/openstack/openstack_instances.go +++ b/openstack/openstack_instances.go @@ -22,19 +22,16 @@ import ( "github.com/golang/glog" "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/pagination" - "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" ) type Instances struct { - compute *gophercloud.ServiceClient - flavor_to_resource map[string]*v1.NodeResources // keyed by flavor id + compute *gophercloud.ServiceClient } // Instances returns an implementation of Instances for OpenStack. @@ -49,37 +46,9 @@ func (os *OpenStack) Instances() (cloudprovider.Instances, bool) { return nil, false } - pager := flavors.ListDetail(compute, nil) - - flavor_to_resource := make(map[string]*v1.NodeResources) - err = pager.EachPage(func(page pagination.Page) (bool, error) { - flavorList, err := flavors.ExtractFlavors(page) - if err != nil { - return false, err - } - for _, flavor := range flavorList { - rsrc := v1.NodeResources{ - Capacity: v1.ResourceList{ - v1.ResourceCPU: *resource.NewQuantity(int64(flavor.VCPUs), resource.DecimalSI), - v1.ResourceMemory: *resource.NewQuantity(int64(flavor.RAM)*MiB, resource.BinarySI), - "openstack.org/disk": *resource.NewQuantity(int64(flavor.Disk)*GB, resource.DecimalSI), - "openstack.org/rxTxFactor": *resource.NewMilliQuantity(int64(flavor.RxTxFactor)*1000, resource.DecimalSI), - "openstack.org/swap": *resource.NewQuantity(int64(flavor.Swap)*MiB, resource.BinarySI), - }, - } - flavor_to_resource[flavor.ID] = &rsrc - } - return true, nil - }) - if err != nil { - glog.Warningf("Failed to find compute flavors: %v", err) - return nil, false - } - - glog.V(3).Infof("Found %v compute flavors", len(flavor_to_resource)) glog.V(1).Info("Claiming to support Instances") - return &Instances{compute, flavor_to_resource}, true + return &Instances{compute}, true } func (i *Instances) List(name_filter string) ([]types.NodeName, error) {