Merge branch 'development' into odim_7044_updateModels

build_images.sh

@@ -72,7 +72,7 @@ eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.sy
 eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.task -t task:6.0 ." "task"
 eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.telemetry -t telemetry:4.0 ." "telemetry"
 eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.update -t update:6.0 ." "update"
-#eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.compositionService -t composition-service:1.0 ." "composition service"
+# eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.compositionService -t composition-service:1.0 ." "composition service"
 
 # ODIMRA plugins image
 eval_cmd_exec "/usr/bin/docker build -f install/Docker/dockerfiles/Dockerfile.urplugin -t urplugin:3.4 ." "urplugin"

lib-utilities/proto/events/events.proto

@@ -28,6 +28,7 @@ service Events {
     rpc IsAggregateHaveSubscription(EventUpdateRequest) returns (SubscribeEMBResponse){}
     rpc DeleteAggregateSubscriptionsRPC(EventUpdateRequest) returns (SubscribeEMBResponse){}
     rpc UpdateSubscriptionLocationRPC(UpdateSubscriptionLocation) returns (SubscribeEMBResponse) {}
+    rpc DeleteSubscription(EventRequest) returns (EventSubResponse) {}
 }
 
 message EventSubRequest {

lib-utilities/services/eventsubscription.go

@@ -43,10 +43,12 @@ func SubscribeToEMB(ctx context.Context, pluginID string, queueList []string) er
 }
 
 // DeleteSubscription  calls the event service and delete all subscription realated to that server
-func DeleteSubscription(ctx context.Context, uuid string) (*eventsproto.EventSubResponse, error) {
+func DeleteSubscription(ctx context.Context, uuid string,
+	sessionToken string) (*eventsproto.EventSubResponse, error) {
 	var resp eventsproto.EventSubResponse
 	req := eventsproto.EventRequest{
-		UUID: uuid,
+		UUID:         uuid,
+		SessionToken: sessionToken,
 	}
 	conn, errConn := ODIMService.Client(Events)
 	if errConn != nil {

lib-utilities/services/pluginTask.go

@@ -47,6 +47,43 @@ func SavePluginTaskInfo(ctx context.Context, pluginIP, pluginServerName,
 	return nil
 }
 
+// SaveEventSubscriptionID saves the event subscription id in db
+// it receives taskID and subscription ID. taskID is the key.
+func SaveEventSubscriptionID(ctx context.Context, taskID, subscriptionID string) error {
+
+	table := "EventSubscriptionID"
+	connPool, err := redis.GetDBConnection(redis.InMemory)
+	if err != nil {
+		return errors.PackError(err.ErrNo(), "error while trying to connecting"+
+			" to DB: ", err.Error())
+	}
+
+	if err = connPool.Create(table, taskID, subscriptionID); err != nil {
+		return errors.PackError(err.ErrNo(), "error while trying to insert"+
+			" plugin task: ", err.Error())
+	}
+	return nil
+}
+
+// SaveEventSubscriptionID saves the event subscription id in db
+// it receives taskID and subscription ID. taskID is the key.
+func GetEventSubscriptionID(ctx context.Context, taskID string) (string, error) {
+
+	table := "EventSubscriptionID"
+	connPool, err := redis.GetDBConnection(redis.InMemory)
+	if err != nil {
+		return "", errors.PackError(err.ErrNo(), "error while trying to connecting"+
+			" to DB: ", err.Error())
+	}
+
+	value, err := connPool.Read(table, taskID)
+	if err != nil {
+		return "", errors.PackError(err.ErrNo(), "error while trying to insert"+
+			" plugin task: ", err.Error())
+	}
+	return value, nil
+}
+
 // createPluginTask will insert plugin task info in DB
 func createPluginTask(ctx context.Context, key string,
 	value interface{}) *errors.Error {

svc-aggregation/agmessagebus/publish_test.go

@@ -134,7 +134,6 @@ func TestPublish(t *testing.T) {
 				assert.NotEqual(t, nil, err, "Error should not be Nil for this scenario")
 
 			} else {
-				fmt.Println(err)
 				assert.Equal(t, nil, err, "Error should be Nil for this scenario")
 
 			}

svc-aggregation/go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
 	github.com/CloudyKit/jet/v6 v6.2.0 // indirect
 	github.com/Joker/jade v1.1.3 // indirect
-	github.com/ODIM-Project/ODIM/lib-persistence-manager v0.0.0-20201201072448-9772421f1b55 // indirect
+	github.com/ODIM-Project/ODIM/lib-persistence-manager v0.0.0-20230719110936-f43048b6407a // indirect
 	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect

svc-aggregation/rpc/aggregator.go

@@ -568,7 +568,7 @@ func (a *Aggregator) DeleteAggregationSource(ctx context.Context, req *aggregato
 	var threadID int = 1
 	ctxt := context.WithValue(ctx, common.ThreadName, common.DeleteAggregationSource)
 	ctxt = context.WithValue(ctxt, common.ThreadID, strconv.Itoa(threadID))
-	go a.connector.DeleteAggregationSources(ctxt, taskID, targetURI, req)
+	go a.connector.DeleteAggregationSources(ctxt, taskID, targetURI, req, sessionUserName)
 	threadID++
 	// return 202 Accepted
 	var rpcResp = response.RPC{

svc-aggregation/rpc/common.go

@@ -43,7 +43,7 @@ func GetAggregator() *Aggregator {
 			CreateTask:               services.CreateTask,
 			CreateChildTask:          services.CreateChildTask,
 			UpdateTask:               system.UpdateTaskData,
-			CreateSubcription:        system.CreateDefaultEventSubscription,
+			CreateSubscription:       system.CreateDefaultEventSubscription,
 			PublishEvent:             system.PublishEvent,
 			GetPluginStatus:          agcommon.GetPluginStatus,
 			SubscribeToEMB:           services.SubscribeToEMB,

svc-aggregation/rpc/common_test.go

@@ -42,7 +42,7 @@ var connector = &system.ExternalInterface{
 	UpdateTask:               mockUpdateTask,
 	DecryptPassword:          stubDevicePassword,
 	GetPluginStatus:          GetPluginStatusForTesting,
-	CreateSubcription:        EventFunctionsForTesting,
+	CreateSubscription:       EventFunctionsForTesting,
 	PublishEvent:             PostEventFunctionForTesting,
 	EncryptPassword:          stubDevicePassword,
 	DeleteComputeSystem:      deleteComputeforTest,
@@ -119,7 +119,7 @@ func deleteSystemforTest(key string) *errors.Error {
 	return nil
 }
 
-func mockDeleteSubscription(ctx context.Context, uuid string) (*eventsproto.EventSubResponse, error) {
+func mockDeleteSubscription(ctx context.Context, uuid string, sessionName string) (*eventsproto.EventSubResponse, error) {
 	if uuid == "/redfish/v1/systems/delete-subscription-error.1" {
 		return nil, fmt.Errorf("error while trying to delete event subcription")
 	} else if uuid == "/redfish/v1/systems/unexpected-statuscode.1" {

svc-aggregation/system/addaggregationsource_test.go

@@ -938,7 +938,7 @@ func getMockExternalInterface() *ExternalInterface {
 		Auth:                    mockIsAuthorized,
 		CreateChildTask:         mockCreateChildTask,
 		UpdateTask:              mockUpdateTask,
-		CreateSubcription:       EventFunctionsForTesting,
+		CreateSubscription:      EventFunctionsForTesting,
 		PublishEvent:            PostEventFunctionForTesting,
 		GetPluginStatus:         GetPluginStatusForTesting,
 		PublishEventMB:          mockPublishEventMB,

svc-aggregation/system/addcompute.go

@@ -136,7 +136,7 @@ func (e *ExternalInterface) addCompute(ctx context.Context, taskID, targetURI, p
 	pluginContactRequest.OID = "/redfish/v1/Systems"
 	pluginContactRequest.DeviceUUID = saveSystem.DeviceUUID
 	pluginContactRequest.HTTPMethodType = http.MethodGet
-	pluginContactRequest.CreateSubcription = e.CreateSubcription
+	pluginContactRequest.CreateSubscription = e.CreateSubscription
 	pluginContactRequest.PublishEvent = e.PublishEvent
 	pluginContactRequest.BMCAddress = saveSystem.ManagerAddress
 
@@ -315,7 +315,7 @@ func (e *ExternalInterface) addCompute(ctx context.Context, taskID, targetURI, p
 	urlList := h.SystemURL
 	urlList = append(urlList, chassisList...)
 	urlList = append(urlList, managersList...)
-	pluginContactRequest.CreateSubcription(ctx, urlList)
+	pluginContactRequest.CreateSubscription(ctx, urlList)
 
 	pluginContactRequest.PublishEvent(ctx, h.SystemURL, "SystemsCollection")
 

svc-aggregation/system/common.go

@@ -81,7 +81,7 @@ type ExternalInterface struct {
 	CreateChildTask          func(context.Context, string, string) (string, error)
 	CreateTask               func(context.Context, string) (string, error)
 	UpdateTask               func(context.Context, common.TaskData) error
-	CreateSubcription        func(context.Context, []string)
+	CreateSubscription       func(context.Context, []string)
 	PublishEvent             func(context.Context, []string, string)
 	PublishEventMB           func(context.Context, string, string, string)
 	GetPluginStatus          func(context.Context, agmodel.Plugin) bool
@@ -90,7 +90,7 @@ type ExternalInterface struct {
 	DecryptPassword          func([]byte) ([]byte, error)
 	DeleteComputeSystem      func(int, string) *errors.Error
 	DeleteSystem             func(string) *errors.Error
-	DeleteEventSubscription  func(context.Context, string) (*eventsproto.EventSubResponse, error)
+	DeleteEventSubscription  func(context.Context, string, string) (*eventsproto.EventSubResponse, error)
 	EventNotification        func(context.Context, string, string, string, agmessagebus.MQBusCommunicator) error
 	GetAllKeysFromTable      func(context.Context, string) ([]string, error)
 	GetConnectionMethod      func(context.Context, string) (agmodel.ConnectionMethod, *errors.Error)
@@ -114,29 +114,29 @@ type responseStatus struct {
 }
 
 type getResourceRequest struct {
-	Data              []byte
-	Username          string
-	Password          string
-	SystemID          string
-	DeviceUUID        string
-	DeviceInfo        interface{}
-	LoginCredentials  map[string]string
-	ParentOID         string
-	OID               string
-	ContactClient     func(context.Context, string, string, string, string, interface{}, map[string]string) (*http.Response, error)
-	OemFlag           bool
-	Plugin            agmodel.Plugin
-	TaskRequest       string
-	HTTPMethodType    string
-	Token             string
-	StatusPoll        bool
-	CreateSubcription func(context.Context, []string)
-	PublishEvent      func(context.Context, []string, string)
-	GetPluginStatus   func(context.Context, agmodel.Plugin) bool
-	UpdateFlag        bool
-	TargetURI         string
-	UpdateTask        func(context.Context, common.TaskData) error
-	BMCAddress        string
+	Data               []byte
+	Username           string
+	Password           string
+	SystemID           string
+	DeviceUUID         string
+	DeviceInfo         interface{}
+	LoginCredentials   map[string]string
+	ParentOID          string
+	OID                string
+	ContactClient      func(context.Context, string, string, string, string, interface{}, map[string]string) (*http.Response, error)
+	OemFlag            bool
+	Plugin             agmodel.Plugin
+	TaskRequest        string
+	HTTPMethodType     string
+	Token              string
+	StatusPoll         bool
+	CreateSubscription func(context.Context, []string)
+	PublishEvent       func(context.Context, []string, string)
+	GetPluginStatus    func(context.Context, agmodel.Plugin) bool
+	UpdateFlag         bool
+	TargetURI          string
+	UpdateTask         func(context.Context, common.TaskData) error
+	BMCAddress         string
 }
 
 type respHolder struct {

svc-aggregation/system/deleteaggregationsource.go

@@ -34,7 +34,8 @@ import (
 )
 
 // DeleteAggregationSources is used to delete aggregation sources
-func (e *ExternalInterface) DeleteAggregationSources(ctx context.Context, taskID string, targetURI string, req *aggregatorproto.AggregatorRequest) error {
+func (e *ExternalInterface) DeleteAggregationSources(ctx context.Context, taskID string, targetURI string,
+	req *aggregatorproto.AggregatorRequest, sessionUserName string) error {
 	var task = common.TaskData{
 		TaskID:          taskID,
 		TargetURI:       targetURI,
@@ -58,7 +59,7 @@ func (e *ExternalInterface) DeleteAggregationSources(ctx context.Context, taskID
 		go runtime.Goexit()
 	}
 	l.LogWithFields(ctx).Debugf("request data for delete aggregation source: %s", string(req.RequestBody))
-	data := e.DeleteAggregationSource(ctx, req)
+	data := e.DeleteAggregationSource(ctx, req, sessionUserName)
 	err = e.UpdateTask(ctx, common.TaskData{
 		TaskID:          taskID,
 		TargetURI:       targetURI,
@@ -83,7 +84,8 @@ func (e *ExternalInterface) DeleteAggregationSources(ctx context.Context, taskID
 }
 
 // DeleteAggregationSource is the handler for removing  bmc or manager
-func (e *ExternalInterface) DeleteAggregationSource(ctx context.Context, req *aggregatorproto.AggregatorRequest) response.RPC {
+func (e *ExternalInterface) DeleteAggregationSource(ctx context.Context,
+	req *aggregatorproto.AggregatorRequest, sessionUserName string) response.RPC {
 	var resp response.RPC
 
 	aggregationSource, dbErr := agmodel.GetAggregationSourceInfo(ctx, req.URL)
@@ -145,7 +147,7 @@ func (e *ExternalInterface) DeleteAggregationSource(ctx context.Context, req *ag
 		}
 		for _, systemURI := range systemList {
 			index := strings.LastIndexAny(systemURI, "/")
-			resp = e.deleteCompute(ctx, systemURI, index, target.PluginID)
+			resp = e.deleteCompute(ctx, systemURI, index, target.PluginID, sessionUserName)
 		}
 		removeAggregationSourceFromAggregates(ctx, systemList)
 	}
@@ -385,7 +387,8 @@ func (e *ExternalInterface) deletePlugin(ctx context.Context, oid string) respon
 	return resp
 }
 
-func (e *ExternalInterface) deleteCompute(ctx context.Context, key string, index int, pluginID string) response.RPC {
+func (e *ExternalInterface) deleteCompute(ctx context.Context, key string, index int, pluginID string,
+	sessionUserName string) response.RPC {
 	var resp response.RPC
 	// check whether the any system operation is under progress
 	systemOperation, dbErr := agmodel.GetSystemOperationInfo(ctx, strings.TrimSuffix(key, "/"))
@@ -441,7 +444,7 @@ func (e *ExternalInterface) deleteCompute(ctx context.Context, key string, index
 		}
 	}()
 	// Delete Subscription on odimra and also on device
-	subResponse, err := e.DeleteEventSubscription(ctx, key)
+	subResponse, err := e.DeleteEventSubscription(ctx, key, sessionUserName)
 	if err != nil && subResponse == nil {
 		errMsg := fmt.Sprintf("error while trying to delete subscriptions: %v", err)
 		l.LogWithFields(ctx).Error(errMsg)