xapp frame rmr wrapper buffer handling fix

[ric-plt/xapp-frame.git] / pkg / models / subscription_detail.go

diff --git a/pkg/models/subscription_detail.go b/pkg/models/subscription_detail.go
index c592c53..f157aba 100644 (file)
--- a/pkg/models/subscription_detail.go
+++ b/pkg/models/subscription_detail.go
@@ -6,14 +6,14 @@ package models
 // Editing this file might prove futile when you re-run the swagger generate command
 
 import (
-       strfmt "github.com/go-openapi/strfmt"
-
        "github.com/go-openapi/errors"
+       "github.com/go-openapi/strfmt"
        "github.com/go-openapi/swag"
        "github.com/go-openapi/validate"
 )
 
 // SubscriptionDetail subscription detail
+//
 // swagger:model SubscriptionDetail
 type SubscriptionDetail struct {
 
@@ -23,19 +23,13 @@ type SubscriptionDetail struct {
 
        // event triggers
        // Required: true
-       EventTriggers *EventTriggerDefinition `json:"EventTriggers"`
-
-       // instance Id
-       // Required: true
-       // Maximum: 65535
-       // Minimum: 0
-       InstanceID *int64 `json:"InstanceId"`
+       EventTriggers EventTriggerDefinition `json:"EventTriggers"`
 
-       // requestor Id
+       // xapp event instance 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
        }