From 7bc205fc59aed53d1583937792652e38de638675 Mon Sep 17 00:00:00 2001 From: realfake Date: Wed, 31 May 2017 23:21:39 +0200 Subject: [PATCH] Implement *ByProviderID methods --- .../providers/azure/azure_instances.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_instances.go b/pkg/cloudprovider/providers/azure/azure_instances.go index 45b109e147..a205aa3e4a 100644 --- a/pkg/cloudprovider/providers/azure/azure_instances.go +++ b/pkg/cloudprovider/providers/azure/azure_instances.go @@ -17,7 +17,6 @@ limitations under the License. package azure import ( - "errors" "fmt" "k8s.io/kubernetes/pkg/api/v1" @@ -44,7 +43,12 @@ func (az *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) { // This method will not be called from the node that is requesting this ID. i.e. metadata service // and other local methods cannot be used here func (az *Cloud) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) { - return []v1.NodeAddress{}, errors.New("unimplemented") + name, err := splitProviderID(providerID) + if err != nil { + return nil, err + } + + return az.NodeAddresses(name) } // ExternalID returns the cloud provider ID of the specified instance (deprecated). @@ -68,7 +72,12 @@ func (az *Cloud) InstanceID(name types.NodeName) (string, error) { // This method will not be called from the node that is requesting this ID. i.e. metadata service // and other local methods cannot be used here func (az *Cloud) InstanceTypeByProviderID(providerID string) (string, error) { - return "", errors.New("unimplemented") + name, err := splitProviderID(providerID) + if err != nil { + return "", err + } + + return az.InstanceID(name) } // InstanceType returns the type of the specified instance.