diff options
author | Eric Multanen <eric.w.multanen@intel.com> | 2020-10-16 23:25:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-10-16 23:25:49 +0000 |
commit | f192f46107c86d3e15e9fb889e2e4382e26e94e3 (patch) | |
tree | be944d97cf01aa3f04fec151026e1e1fbe96e636 /src/dcm/pkg/module/cluster.go | |
parent | 2573d840571cb511e27ba5ef663a4b99bc717a45 (diff) | |
parent | 5e013d0d327dee9f5cd53fee6ec8d2d2593e0258 (diff) |
Merge "Restore commented unit test TestDeleteLogicalCloud"
Diffstat (limited to 'src/dcm/pkg/module/cluster.go')
-rw-r--r-- | src/dcm/pkg/module/cluster.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/dcm/pkg/module/cluster.go b/src/dcm/pkg/module/cluster.go index 9aecc6ca..6ad46404 100644 --- a/src/dcm/pkg/module/cluster.go +++ b/src/dcm/pkg/module/cluster.go @@ -260,7 +260,11 @@ func (v *ClusterClient) UpdateCluster(project, logicalCloud, clusterReference st // Get returns Cluster's kubeconfig for corresponding cluster reference func (v *ClusterClient) GetClusterConfig(project, logicalCloud, clusterReference string) (string, error) { lcClient := NewLogicalCloudClient() - context, ctxVal, err := lcClient.GetLogicalCloudContext(project, logicalCloud) + lckey := LogicalCloudKey{ + Project: project, + LogicalCloudName: logicalCloud, + } + context, ctxVal, err := lcClient.util.GetLogicalCloudContext(lcClient.storeName, lckey, lcClient.tagMeta, project, logicalCloud) if err != nil { return "", pkgerrors.Wrap(err, "Error getting logical cloud context.") } @@ -268,11 +272,6 @@ func (v *ClusterClient) GetClusterConfig(project, logicalCloud, clusterReference return "", pkgerrors.New("Logical Cloud hasn't been applied yet") } - // private key comes from logical cloud - lckey := LogicalCloudKey{ - Project: project, - LogicalCloudName: logicalCloud, - } // get logical cloud resource lc, err := lcClient.Get(project, logicalCloud) if err != nil { |