From 5ef7893bd15baf496a4b1b4152242f0d8adb9ff8 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Mon, 9 Sep 2019 14:24:58 +0800 Subject: [PATCH] Fix elb job url issue --- openstack/networking/v2/extensions/elb/job.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/openstack/networking/v2/extensions/elb/job.go b/openstack/networking/v2/extensions/elb/job.go index 728f6a7fc..b4ce3ad10 100644 --- a/openstack/networking/v2/extensions/elb/job.go +++ b/openstack/networking/v2/extensions/elb/job.go @@ -1,9 +1,6 @@ package elb import ( - "regexp" - "strings" - "github.com/huaweicloud/golangsdk" ) @@ -46,13 +43,9 @@ func (r JobInfoResult) Extract() (*JobInfo, error) { return j, err } -func QueryJobInfo(c *golangsdk.ServiceClient, uri string) (r JobInfoResult) { - vv := regexp.MustCompile("/v[0-9]+\\.?[0-9]*/?$") +func QueryJobInfo(c *golangsdk.ServiceClient, jobId string) (r JobInfoResult) { e := c.ResourceBaseURL() - if vv.MatchString(e) { - i := strings.LastIndex(e, "/v") - e = e[:i] - } - _, r.Err = c.Get(e+uri, &r.Body, nil) + e = e + c.ProjectID + "/jobs/" + jobId + _, r.Err = c.Get(e, &r.Body, nil) return }