// Callback handler for subscription response notifications
//-----------------------------------------------------------------------------
func (tc *E2Stub) SubscriptionRespHandler(resp *clientmodel.SubscriptionResponse) {
- if tc.subscriptionId == *resp.SubscriptionID {
+ if tc.subscriptionId == "SUBSCRIPTIONID NOT SET" {
+ tc.Info("REST notification received for %v while no SubscriptionID was not set for InstanceID=%v, RequestorID=%v (%v)",
+ *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
+ tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID
+ } else if tc.subscriptionId == *resp.SubscriptionID {
tc.Info("REST notification received SubscriptionID=%s, InstanceID=%v, RequestorID=%v (%v)",
*resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID
//
//-----------------------------------------------------------------------------
func (tc *E2Stub) SendRESTSubsReq(t *testing.T, params *RESTSubsReqParams) string { // This need to be edited according to new specification
- tc.Info("Posting REST Report subscriptions to Submgr")
+ tc.Info("======== Posting REST Report subscriptions to Submgr ======")
if params == nil {
tc.Info("SendRESTReportSubsReq: params == nil")
return ""
}
+ tc.subscriptionId = "SUBSCIPTIONID NOT SET"
+
resp, err := xapp.Subscription.Subscribe(¶ms.SubsReqParams)
if err != nil {
// Swagger generated code makes checks for the values that are inserted the subscription function
// If error cause is unknown and POST is not done, the problem is in the inserted values
- tc.Error("REST report subscriptions failed %s", err.Error())
+ tc.Error("======== REST report subscriptions failed %s ========", err.Error())
+ return ""
}
tc.subscriptionId = *resp.SubscriptionID
- tc.Info("REST report subscriptions pushed successfully. SubscriptionID = %s, RequestCount = %v", *resp.SubscriptionID, tc.requestCount)
+ tc.Info("======== REST report subscriptions posted successfully. SubscriptionID = %s, RequestCount = %v ========", *resp.SubscriptionID, tc.requestCount)
return *resp.SubscriptionID
}
}
}
+func (p *RESTSubsReqParams) SetSubActionIDs(actionId int64) {
+
+ for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
+ for _, action := range subDetail.ActionToBeSetupList {
+ if action != nil {
+ action.ActionID = &actionId
+ }
+ }
+ }
+}
+
+func (p *RESTSubsReqParams) SetSubActionDefinition(actionDefinition string) {
+
+ for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
+ for _, action := range subDetail.ActionToBeSetupList {
+ if action != nil {
+ action.ActionDefinition.OctetString = actionDefinition
+ }
+ }
+ }
+}
+
+func (p *RESTSubsReqParams) SetSubEventTriggerDefinition(eventTriggerDefinition string) {
+
+ for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
+ if subDetail != nil {
+ subDetail.EventTriggers.OctetString = eventTriggerDefinition
+ }
+ }
+}
+
+func (p *RESTSubsReqParams) AppendActionToActionToBeSetupList(actionId int64, actionType string, actionDefinition string, subsequentActionType string, timeToWait string) {
+
+ actionToBeSetup := &clientmodel.ActionToBeSetup{
+ ActionID: &actionId,
+ ActionType: &actionType,
+ ActionDefinition: &clientmodel.ActionDefinition{
+ OctetString: actionDefinition,
+ },
+ SubsequentAction: &clientmodel.SubsequentAction{
+ SubsequentActionType: &subsequentActionType,
+ TimeToWait: &timeToWait,
+ },
+ }
+
+ for _, subDetail := range p.SubsReqParams.SubscriptionDetails {
+ if subDetail != nil {
+ subDetail.ActionToBeSetupList = append(subDetail.ActionToBeSetupList, actionToBeSetup)
+ }
+ }
+}
+
func (p *RESTSubsReqParams) SetRMREndpoint(RMR_port int64, host string) {
p.SubsReqParams.ClientEndpoint.RMRPort = &RMR_port