X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fclientmodel%2Fsubscription_detail.go;h=db04cb9c14bb3bac6c32c23b50554d95897b7c8d;hb=2fe100b35c1586dba1d7e9856fdec68091c22df0;hp=0a665405180a95938cb1acd495196ca1a02b2173;hpb=c79bd0e1a4fe855b06c8f8131f162d0ee4a5f9f5;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/clientmodel/subscription_detail.go b/pkg/clientmodel/subscription_detail.go
index 0a66540..db04cb9 100644
--- a/pkg/clientmodel/subscription_detail.go
+++ b/pkg/clientmodel/subscription_detail.go
@@ -23,19 +23,13 @@ type SubscriptionDetail struct {
 
 	// event triggers
 	// Required: true
-	EventTriggers *EventTriggerDefinition `json:"EventTriggers"`
+	EventTriggers EventTriggerDefinition `json:"EventTriggers"`
 
-	// instance Id
+	// xapp event instance Id
 	// Required: true
 	// Maximum: 65535
 	// Minimum: 0
-	InstanceID *int64 `json:"InstanceId"`
-
-	// requestor Id
-	// Required: true
-	// Maximum: 65535
-	// Minimum: 0
-	RequestorID *int64 `json:"RequestorId"`
+	XappEventInstanceID *int64 `json:"XappEventInstanceId"`
 }
 
 // Validate validates this subscription detail
@@ -50,11 +44,7 @@ func (m *SubscriptionDetail) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateInstanceID(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRequestorID(formats); err != nil {
+	if err := m.validateXappEventInstanceID(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -86,46 +76,27 @@ func (m *SubscriptionDetail) validateEventTriggers(formats strfmt.Registry) erro
 		return err
 	}
 
-	if m.EventTriggers != nil {
-		if err := m.EventTriggers.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("EventTriggers")
-			}
-			return err
+	if err := m.EventTriggers.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("EventTriggers")
 		}
-	}
-
-	return nil
-}
-
-func (m *SubscriptionDetail) validateInstanceID(formats strfmt.Registry) error {
-
-	if err := validate.Required("InstanceId", "body", m.InstanceID); err != nil {
-		return err
-	}
-
-	if err := validate.MinimumInt("InstanceId", "body", int64(*m.InstanceID), 0, false); err != nil {
-		return err
-	}
-
-	if err := validate.MaximumInt("InstanceId", "body", int64(*m.InstanceID), 65535, false); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (m *SubscriptionDetail) validateRequestorID(formats strfmt.Registry) error {
+func (m *SubscriptionDetail) validateXappEventInstanceID(formats strfmt.Registry) error {
 
-	if err := validate.Required("RequestorId", "body", m.RequestorID); err != nil {
+	if err := validate.Required("XappEventInstanceId", "body", m.XappEventInstanceID); err != nil {
 		return err
 	}
 
-	if err := validate.MinimumInt("RequestorId", "body", int64(*m.RequestorID), 0, false); err != nil {
+	if err := validate.MinimumInt("XappEventInstanceId", "body", int64(*m.XappEventInstanceID), 0, false); err != nil {
 		return err
 	}
 
-	if err := validate.MaximumInt("RequestorId", "body", int64(*m.RequestorID), 65535, false); err != nil {
+	if err := validate.MaximumInt("XappEventInstanceId", "body", int64(*m.XappEventInstanceID), 65535, false); err != nil {
 		return err
 	}