Merge "Enhance error handling and HTTP codes in DCM"

5 files changed, 17 insertions, 14 deletions

diff --git a/src/dcm/pkg/module/cluster.go b/src/dcm/pkg/module/cluster.go
index 206d79a6..85b20117 100644
--- a/src/dcm/pkg/module/cluster.go
+++ b/src/dcm/pkg/module/cluster.go
@@ -133,7 +133,7 @@ func (v *ClusterClient) GetCluster(project, logicalCloud, clusterReference strin
 		return cl, nil
 	}
 
-	return Cluster{}, pkgerrors.New("Error getting Cluster")
+	return Cluster{}, pkgerrors.New("Cluster Reference does not exist")
 }
 
 // GetAll returns all cluster references in the logical cloud
@@ -149,6 +149,9 @@ func (v *ClusterClient) GetAllClusters(project, logicalCloud string) ([]Cluster,
 	if err != nil {
 		return []Cluster{}, pkgerrors.Wrap(err, "Get All Cluster references")
 	}
+	if len(values) == 0 {
+		return []Cluster{}, pkgerrors.New("No Cluster References associated")
+	}
 
 	for _, value := range values {
 		cl := Cluster{}
@@ -188,12 +191,12 @@ func (v *ClusterClient) UpdateCluster(project, logicalCloud, clusterReference st
 
 	//Check for name mismatch in cluster reference
 	if c.MetaData.ClusterReference != clusterReference {
-		return Cluster{}, pkgerrors.New("Update Error - Cluster reference mismatch")
+		return Cluster{}, pkgerrors.New("Cluster Reference mismatch")
 	}
 	//Check if this Cluster reference exists
 	_, err := v.GetCluster(project, logicalCloud, clusterReference)
 	if err != nil {
-		return Cluster{}, pkgerrors.New("Update Error - Cluster reference doesn't exist")
+		return Cluster{}, pkgerrors.New("Cluster Reference does not exist")
 	}
 	err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
 	if err != nil {
diff --git a/src/dcm/pkg/module/keyvalue.go b/src/dcm/pkg/module/keyvalue.go
index 37c74a84..0127a6f4 100644
--- a/src/dcm/pkg/module/keyvalue.go
+++ b/src/dcm/pkg/module/keyvalue.go
@@ -133,7 +133,7 @@ func (v *KeyValueClient) GetKVPair(project, logicalCloud, kvPairName string) (Ke
 		return kv, nil
 	}
 
-	return KeyValue{}, pkgerrors.New("Error getting Key Value")
+	return KeyValue{}, pkgerrors.New("Key Value does not exist")
 }
 
 // Get All lists all key value pairs
@@ -194,7 +194,7 @@ func (v *KeyValueClient) UpdateKVPair(project, logicalCloud, kvPairName string,
 	//Check if this Key Value exists
 	_, err := v.GetKVPair(project, logicalCloud, kvPairName)
 	if err != nil {
-		return KeyValue{}, pkgerrors.New("Update Error - Key Value Pair doesn't exist")
+		return KeyValue{}, pkgerrors.New("KV Pair does not exist")
 	}
 	err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
 	if err != nil {
diff --git a/src/dcm/pkg/module/logicalcloud.go b/src/dcm/pkg/module/logicalcloud.go
index 51ee387d..7d3c806b 100644
--- a/src/dcm/pkg/module/logicalcloud.go
+++ b/src/dcm/pkg/module/logicalcloud.go
@@ -145,7 +145,7 @@ func (v *LogicalCloudClient) Get(project, logicalCloudName string) (LogicalCloud
 	}
 	value, err := v.util.DBFind(v.storeName, key, v.tagMeta)
 	if err != nil {
-		return LogicalCloud{}, pkgerrors.Wrap(err, "Get Logical Cloud")
+		return LogicalCloud{}, pkgerrors.Wrap(err, "Error getting Logical Cloud")
 	}
 
 	//value is a byte array
@@ -153,12 +153,12 @@ func (v *LogicalCloudClient) Get(project, logicalCloudName string) (LogicalCloud
 		lc := LogicalCloud{}
 		err = v.util.DBUnmarshal(value[0], &lc)
 		if err != nil {
-			return LogicalCloud{}, pkgerrors.Wrap(err, "Unmarshaling value")
+			return LogicalCloud{}, pkgerrors.Wrap(err, "Error unmarshaling value")
 		}
 		return lc, nil
 	}
 
-	return LogicalCloud{}, pkgerrors.New("Error getting Logical Cloud")
+	return LogicalCloud{}, pkgerrors.New("Logical Cloud does not exist")
 }
 
 // GetAll returns Logical Clouds in the project
@@ -213,12 +213,12 @@ func (v *LogicalCloudClient) Update(project, logicalCloudName string, c LogicalC
 	}
 	// Check for mismatch, logicalCloudName and payload logical cloud name
 	if c.MetaData.LogicalCloudName != logicalCloudName {
-		return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud name mismatch")
+		return LogicalCloud{}, pkgerrors.New("Logical Cloud name mismatch")
 	}
 	//Check if this Logical Cloud exists
 	_, err := v.Get(project, logicalCloudName)
 	if err != nil {
-		return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud doesn't exist")
+		return LogicalCloud{}, pkgerrors.New("Logical Cloud does not exist")
 	}
 	err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
 	if err != nil {
diff --git a/src/dcm/pkg/module/quota.go b/src/dcm/pkg/module/quota.go
index cbd9c8b7..8e15a794 100644
--- a/src/dcm/pkg/module/quota.go
+++ b/src/dcm/pkg/module/quota.go
@@ -152,7 +152,7 @@ func (v *QuotaClient) GetQuota(project, logicalCloud, quotaName string) (Quota,
 		return q, nil
 	}
 
-	return Quota{}, pkgerrors.New("Error getting Quota")
+	return Quota{}, pkgerrors.New("Cluster Quota does not exist")
 }
 
 // GetAll returns all cluster quotas in the logical cloud
@@ -211,7 +211,7 @@ func (v *QuotaClient) UpdateQuota(project, logicalCloud, quotaName string, c Quo
 	//Check if this Quota exists
 	_, err := v.GetQuota(project, logicalCloud, quotaName)
 	if err != nil {
-		return Quota{}, pkgerrors.New("Update Error - Quota doesn't exist")
+		return Quota{}, pkgerrors.New("Cluster Quota does not exist")
 	}
 	err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
 	if err != nil {
diff --git a/src/dcm/pkg/module/userpermissions.go b/src/dcm/pkg/module/userpermissions.go
index 2cff712b..4c918f0f 100644
--- a/src/dcm/pkg/module/userpermissions.go
+++ b/src/dcm/pkg/module/userpermissions.go
@@ -124,7 +124,7 @@ func (v *UserPermissionClient) GetUserPerm(project, logicalCloud, userPermName s
 		return up, nil
 	}
 
-	return UserPermission{}, pkgerrors.New("Error getting User Permission")
+	return UserPermission{}, pkgerrors.New("User Permission does not exist")
 }
 
 // GetAll lists all user permissions
@@ -184,7 +184,7 @@ func (v *UserPermissionClient) UpdateUserPerm(project, logicalCloud, userPermNam
 	_, err := v.GetUserPerm(project, logicalCloud, userPermName)
 	if err != nil {
 		return UserPermission{}, pkgerrors.New(
-			"Update Error - User Permission doesn't exist")
+			"User Permission does not exist")
 	}
 	err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
 	if err != nil {