diff options
author | Bin Yang <bin.yang@windriver.com> | 2019-05-24 04:37:20 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-24 04:37:20 +0000 |
commit | 574eb961e8651ba4e4f0f92d7984a2716e5e64f7 (patch) | |
tree | e143f2d36b1eed39100c9eb26f8b4f61e545e5da /src/k8splugin/internal/app/config_backend.go | |
parent | 3eeb40cfe56366ca72e811bdfb6f2faf127f8a2f (diff) | |
parent | 5207bd099a84832a5d7c3333bf540fa8481ce78a (diff) |
Merge changes from topics "broker_response", "develop"
* changes:
Update broker responses to match spec and SO
Minor change to instance response
Diffstat (limited to 'src/k8splugin/internal/app/config_backend.go')
-rw-r--r-- | src/k8splugin/internal/app/config_backend.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/k8splugin/internal/app/config_backend.go b/src/k8splugin/internal/app/config_backend.go index 763aed0d..9894b6ac 100644 --- a/src/k8splugin/internal/app/config_backend.go +++ b/src/k8splugin/internal/app/config_backend.go @@ -343,7 +343,7 @@ func scheduleResources(c chan configResourceList) { data := <-c //TODO: ADD Check to see if Application running ic := NewInstanceClient() - resp, err := ic.Find(data.profile.RBName, data.profile.RBVersion, data.profile.ProfileName) + resp, err := ic.Find(data.profile.RBName, data.profile.RBVersion, data.profile.ProfileName, nil) if err != nil || len(resp) == 0 { log.Println("Error finding a running instance. Retrying later...") time.Sleep(time.Second * 10) @@ -354,7 +354,7 @@ func scheduleResources(c chan configResourceList) { log.Printf("[scheduleResources]: POST %v %v", data.profile, data.resourceTemplates) for _, inst := range resp { k8sClient := KubernetesClient{} - err = k8sClient.init(inst.CloudRegion) + err = k8sClient.init(inst.Request.CloudRegion) if err != nil { log.Printf("Getting CloudRegion Information: %s", err.Error()) //Move onto the next cloud region @@ -374,7 +374,7 @@ func scheduleResources(c chan configResourceList) { log.Printf("[scheduleResources]: DELETE %v %v", data.profile, data.resourceTemplates) for _, inst := range resp { k8sClient := KubernetesClient{} - err = k8sClient.init(inst.CloudRegion) + err = k8sClient.init(inst.Request.CloudRegion) if err != nil { log.Printf("Getting CloudRegion Information: %s", err.Error()) //Move onto the next cloud region |