From: Ruoyu Ying <ruoyu.ying@intel.com>
Date: Tue, 8 Feb 2022 05:06:36 +0000 (-0500)
Subject: Minor fixes in scc
X-Git-Tag: 21.12.03~7
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=b5d7f30b10bf8ae63388a9588c5664bad25001e0;p=icn%2Fsdwan.git

Minor fixes in scc

* Add db operations after deleting delegate hub
* Fix typo

Change-Id: I103063f786cfdfe294993abea2ef3f868da6193c
Signed-off-by: Ruoyu <ruoyu.ying@intel.com>
---

diff --git a/central-controller/src/scc/pkg/manager/hubdevice_objectmanager.go b/central-controller/src/scc/pkg/manager/hubdevice_objectmanager.go
index 47b45b2..cbcf70b 100644
--- a/central-controller/src/scc/pkg/manager/hubdevice_objectmanager.go
+++ b/central-controller/src/scc/pkg/manager/hubdevice_objectmanager.go
@@ -180,12 +180,15 @@ func (c *HubDeviceObjectManager) DeleteObject(m map[string]string) error {
 
 	if dev_obj.Status.DelegatedHub == hub_obj.Metadata.Name {
 		dev_obj.Status.DelegatedHub = ""
+		dev_manager.UpdateObject(m, dev_obj)
+
 		for i, item := range hub_obj.Status.DelegateDevices {
 			if item == dev_obj.Metadata.Name {
 				hub_obj.Status.DelegateDevices = append(hub_obj.Status.DelegateDevices[:i], hub_obj.Status.DelegateDevices[i+1:]...)
 				break
 			}
 		}
+		hub_manager.UpdateObject(m, hub_obj)
 	}
 
 	conn, err := conn_manager.GetObject(overlay_name,
diff --git a/central-controller/src/scc/pkg/manager/resource_objectmanager.go b/central-controller/src/scc/pkg/manager/resource_objectmanager.go
index 0c36968..ae4c4ea 100644
--- a/central-controller/src/scc/pkg/manager/resource_objectmanager.go
+++ b/central-controller/src/scc/pkg/manager/resource_objectmanager.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/akraino-edge-stack/icn-sdwan/central-controller/src/scc/pkg/module"
 	"github.com/open-ness/EMCO/src/orchestrator/pkg/infra/db"
+	pkgerrors "github.com/pkg/errors"
 )
 
 type ResourceObjectKey struct {
@@ -59,6 +60,7 @@ func (c *ResourceObjectManager) CreateEmptyObject() module.ControllerObject {
 }
 
 func (c *ResourceObjectManager) GetStoreKey(m map[string]string, t module.ControllerObject, isCollection bool) (db.Key, error) {
+	// Currently no collections fetching supported
 	return ResourceObjectKey{
 		Cluster: m[OverlayResource] + "-" + m[DeviceResource],
 		Type:  m["Type"],
@@ -85,9 +87,7 @@ func (c *ResourceObjectManager) GetObject(m map[string]string) (module.Controlle
 }
 
 func (c *ResourceObjectManager) GetObjects(m map[string]string) ([]module.ControllerObject, error) {
-	// DB Operation
-	t, err := GetDBUtils().GetObjects(c, m)
-	return t, err
+	return []module.ControllerObject{}, pkgerrors.New("Not implemented")
 }
 
 func (c *ResourceObjectManager) UpdateObject(m map[string]string, t module.ControllerObject) (module.ControllerObject, error) {
diff --git a/central-controller/src/scc/pkg/manager/resutils.go b/central-controller/src/scc/pkg/manager/resutils.go
index 212aba1..887fe65 100644
--- a/central-controller/src/scc/pkg/manager/resutils.go
+++ b/central-controller/src/scc/pkg/manager/resutils.go
@@ -439,7 +439,7 @@ func (d *ResUtil) Undeploy(overlay string) error {
 						resource.Status = 2
 						errMessage = errMessage + " " + resource.Resource.GetName()
 					} else {
-						// reset rewource status
+						// reset resource status
 						resource.Status = 1
 						resobj.Specification.Ref = 0
 						res_manager.DeleteObject(m)