bug fix
diff --git a/api_test.go b/api_test.go
index ff3acbb..2fe6bc0 100644
--- a/api_test.go
+++ b/api_test.go
@@ -20,12 +20,13 @@
}
const testQuotaAPIURL = "http://localhost:9000/quota"
+const testValidOrg = "edgexfeb1"
var _ = Describe("Api Tests", func() {
It("test Synchronous quota - valid test cases", func() {
requestData := make(map[string]interface{})
- requestData["edgeOrgID"] = "testTenant"
- requestData["id"] = "testID"
+ requestData["edgeOrgID"] = testValidOrg
+ requestData["id"] = "testAppID"
requestData["interval"] = 1
requestData["timeUnit"] = "HOUR"
requestData["type"] = "CALENDAR"
@@ -53,7 +54,7 @@
Fail("error calling the api: " + err.Error())
}
- // Check the status code is what we expect.
+ // Check the status code is 200 OK.
if status := res.StatusCode; status != http.StatusOK {
respBodyBytes, err := ioutil.ReadAll(res.Body)
respBody := make(map[string]interface{})
diff --git a/quotaBucket/apiUtil.go b/quotaBucket/apiUtil.go
index 600ef01..26b958d 100644
--- a/quotaBucket/apiUtil.go
+++ b/quotaBucket/apiUtil.go
@@ -273,7 +273,7 @@
func (qBucketResults *QuotaBucketResults) ToAPIResponse() map[string]interface{} {
resultsMap := make(map[string]interface{})
- resultsMap[reqEdgeOrgID] = qBucketResults.ID
+ resultsMap[reqEdgeOrgID] = qBucketResults.EdgeOrgID
resultsMap[reqID] = qBucketResults.ID
resultsMap[reqMaxCount] = qBucketResults.MaxCount
resultsMap["exceeded"] = qBucketResults.exceeded
diff --git a/quotaBucket/quotaBucket.go b/quotaBucket/quotaBucket.go
index c23f428..081211e 100644
--- a/quotaBucket/quotaBucket.go
+++ b/quotaBucket/quotaBucket.go
@@ -256,6 +256,9 @@
}
if exitCount > 3 {
+ removeFromCache( quotaBucket.GetEdgeOrgID()+
+ constants.CacheKeyDelimiter + quotaBucket.GetID(),
+ quotaCache[quotaBucket.GetEdgeOrgID()+constants.CacheKeyDelimiter + quotaBucket.GetID()])
qticker.Stop()
}
}
