address review-2

Author: asm582

pkg/quotaplugins/quota-forest/quota-manager/quota/quotamanager.go

@@ -19,12 +19,12 @@ package quota
 import (
 	"bytes"
 	"fmt"
-	"regexp"
 	"strings"
 
 	clientset "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/quota-forest/quota-manager/quota/core"
 	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/quota-forest/quota-manager/quota/utils"
+	"github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/quotaplugins/util"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
@@ -369,29 +369,31 @@ func (m *Manager) UpdateForest(forestName string) (unallocatedConsumerIDs []stri
 // AllocateForest : allocate a consumer on a forest
 func (m *Manager) AllocateForest(forestName string, consumerID string) (response *core.AllocationResponse, err error) {
 	forestController := m.forests[forestName]
-	var awExistsInNamespace bool = false
 	if forestController == nil {
 		return nil, fmt.Errorf("invalid forest name %s", forestName)
 	}
 	consumerInfo := m.consumerInfos[consumerID]
 	if consumerInfo == nil {
 		return nil, fmt.Errorf("consumer %s does not exist, create and add first", consumerID)
 	}
-	//allocation can pass if consumers are not released
+	//allocation can pass if consumers inside the forest is not released
 	//make sure that appwrapper (consumer) does not exist in target namespace
-	re := regexp.MustCompile("_")
-	split := re.Split(consumerID, -1)
-	namespace := split[1]
-	awName := split[3]
+	namespace, awName := util.ParseId(consumerID)
 	config, err := rest.InClusterConfig()
 	if err != nil {
 		klog.Errorf("unable to retrieve in-cluster kubeconfig %v", err)
 	}
 	arbclients := clientset.NewForConfigOrDie(config)
 	awQueried, err := arbclients.ArbV1().AppWrappers(namespace).Get(awName, v1.GetOptions{})
+	var awExistsInNamespace bool = false
+	if err != nil {
+		klog.Errorf("Unable to query consumer %v,", consumerID)
+		//force set to true
+		awExistsInNamespace = true
+	}
 	if awQueried.Name == awName {
 		awExistsInNamespace = true
-		klog.V(5).Infof("Found consumer %v in namespace", consumerID)
+		klog.V(5).Infof("[AllocateForest] Found consumer %v in namespace", consumerID)
 	}
 	if awExistsInNamespace {
 		if forestController.IsConsumerAllocated(consumerID) {