Subscription REST interface update

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

diff --git a/pkg/models/subscription_instance.go b/pkg/models/subscription_instance.go
index e028de9..970ae26 100644 (file)
--- a/pkg/models/subscription_instance.go
+++ b/pkg/models/subscription_instance.go
@@ -26,22 +26,15 @@ type SubscriptionInstance struct {
        E2EventInstanceID *int64 `json:"E2EventInstanceId"`
 
        // Descriptive error cause. Empty string when no error.
-       // Required: true
-       ErrorCause *string `json:"ErrorCause"`
+       ErrorCause string `json:"ErrorCause,omitempty"`
 
        // Source of error cause.
-       // Required: true
-       // Enum: [None SUBMGR RTMGR DBAAS ASN1 E2Node]
-       ErrorSource *string `json:"ErrorSource"`
+       // Enum: [SUBMGR RTMGR DBAAS ASN1 E2Node]
+       ErrorSource string `json:"ErrorSource,omitempty"`
 
-       // Reason for REST subscription rejection.
-       // Enum: [None REST-subscription-ongoing REST-subscription-delete-ongoing Invalid-REST-request-message REST-subscription-with-given-id-does-not-exist E2-interface-down Other]
-       RejectCause *string `json:"RejectCause,omitempty"`
-
-       // Type timeout. xApp should retry if timeout occours.
-       // Required: true
-       // Enum: [None E2-Timeout RTMGR-Timeout DBAAS-Timeout]
-       TimeoutType *string `json:"TimeoutType"`
+       // Type timeout. xApp should retry if timeout occurs.
+       // Enum: [E2-Timeout RTMGR-Timeout DBAAS-Timeout]
+       TimeoutType string `json:"TimeoutType,omitempty"`
 
        // xapp event instance Id
        // Required: true
@@ -58,18 +51,10 @@ func (m *SubscriptionInstance) Validate(formats strfmt.Registry) error {
                res = append(res, err)
        }
 
-       if err := m.validateErrorCause(formats); err != nil {
-               res = append(res, err)
-       }
-
        if err := m.validateErrorSource(formats); err != nil {
                res = append(res, err)
        }
 
-       if err := m.validateRejectCause(formats); err != nil {
-               res = append(res, err)
-       }
-
        if err := m.validateTimeoutType(formats); err != nil {
                res = append(res, err)
        }
@@ -101,20 +86,11 @@ func (m *SubscriptionInstance) validateE2EventInstanceID(formats strfmt.Registry
        return nil
 }
 
-func (m *SubscriptionInstance) validateErrorCause(formats strfmt.Registry) error {
-
-       if err := validate.Required("ErrorCause", "body", m.ErrorCause); err != nil {
-               return err
-       }
-
-       return nil
-}
-
 var subscriptionInstanceTypeErrorSourcePropEnum []interface{}
 
 func init() {
        var res []string
-       if err := json.Unmarshal([]byte(`["None","SUBMGR","RTMGR","DBAAS","ASN1","E2Node"]`), &res); err != nil {
+       if err := json.Unmarshal([]byte(`["SUBMGR","RTMGR","DBAAS","ASN1","E2Node"]`), &res); err != nil {
                panic(err)
        }
        for _, v := range res {
@@ -124,9 +100,6 @@ func init() {
 
 const (
 
-       // SubscriptionInstanceErrorSourceNone captures enum value "None"
-       SubscriptionInstanceErrorSourceNone string = "None"
-
        // SubscriptionInstanceErrorSourceSUBMGR captures enum value "SUBMGR"
        SubscriptionInstanceErrorSourceSUBMGR string = "SUBMGR"
 
@@ -153,70 +126,12 @@ func (m *SubscriptionInstance) validateErrorSourceEnum(path, location string, va
 
 func (m *SubscriptionInstance) validateErrorSource(formats strfmt.Registry) error {
 
-       if err := validate.Required("ErrorSource", "body", m.ErrorSource); err != nil {
-               return err
-       }
-
-       // value enum
-       if err := m.validateErrorSourceEnum("ErrorSource", "body", *m.ErrorSource); err != nil {
-               return err
-       }
-
-       return nil
-}
-
-var subscriptionInstanceTypeRejectCausePropEnum []interface{}
-
-func init() {
-       var res []string
-       if err := json.Unmarshal([]byte(`["None","REST-subscription-ongoing","REST-subscription-delete-ongoing","Invalid-REST-request-message","REST-subscription-with-given-id-does-not-exist","E2-interface-down","Other"]`), &res); err != nil {
-               panic(err)
-       }
-       for _, v := range res {
-               subscriptionInstanceTypeRejectCausePropEnum = append(subscriptionInstanceTypeRejectCausePropEnum, v)
-       }
-}
-
-const (
-
-       // SubscriptionInstanceRejectCauseNone captures enum value "None"
-       SubscriptionInstanceRejectCauseNone string = "None"
-
-       // SubscriptionInstanceRejectCauseRESTSubscriptionOngoing captures enum value "REST-subscription-ongoing"
-       SubscriptionInstanceRejectCauseRESTSubscriptionOngoing string = "REST-subscription-ongoing"
-
-       // SubscriptionInstanceRejectCauseRESTSubscriptionDeleteOngoing captures enum value "REST-subscription-delete-ongoing"
-       SubscriptionInstanceRejectCauseRESTSubscriptionDeleteOngoing string = "REST-subscription-delete-ongoing"
-
-       // SubscriptionInstanceRejectCauseInvalidRESTRequestMessage captures enum value "Invalid-REST-request-message"
-       SubscriptionInstanceRejectCauseInvalidRESTRequestMessage string = "Invalid-REST-request-message"
-
-       // SubscriptionInstanceRejectCauseRESTSubscriptionWithGivenIDDoesNotExist captures enum value "REST-subscription-with-given-id-does-not-exist"
-       SubscriptionInstanceRejectCauseRESTSubscriptionWithGivenIDDoesNotExist string = "REST-subscription-with-given-id-does-not-exist"
-
-       // SubscriptionInstanceRejectCauseE2InterfaceDown captures enum value "E2-interface-down"
-       SubscriptionInstanceRejectCauseE2InterfaceDown string = "E2-interface-down"
-
-       // SubscriptionInstanceRejectCauseOther captures enum value "Other"
-       SubscriptionInstanceRejectCauseOther string = "Other"
-)
-
-// prop value enum
-func (m *SubscriptionInstance) validateRejectCauseEnum(path, location string, value string) error {
-       if err := validate.Enum(path, location, value, subscriptionInstanceTypeRejectCausePropEnum); err != nil {
-               return err
-       }
-       return nil
-}
-
-func (m *SubscriptionInstance) validateRejectCause(formats strfmt.Registry) error {
-
-       if swag.IsZero(m.RejectCause) { // not required
+       if swag.IsZero(m.ErrorSource) { // not required
                return nil
        }
 
        // value enum
-       if err := m.validateRejectCauseEnum("RejectCause", "body", *m.RejectCause); err != nil {
+       if err := m.validateErrorSourceEnum("ErrorSource", "body", m.ErrorSource); err != nil {
                return err
        }
 
@@ -227,7 +142,7 @@ var subscriptionInstanceTypeTimeoutTypePropEnum []interface{}
 
 func init() {
        var res []string
-       if err := json.Unmarshal([]byte(`["None","E2-Timeout","RTMGR-Timeout","DBAAS-Timeout"]`), &res); err != nil {
+       if err := json.Unmarshal([]byte(`["E2-Timeout","RTMGR-Timeout","DBAAS-Timeout"]`), &res); err != nil {
                panic(err)
        }
        for _, v := range res {
@@ -237,9 +152,6 @@ func init() {
 
 const (
 
-       // SubscriptionInstanceTimeoutTypeNone captures enum value "None"
-       SubscriptionInstanceTimeoutTypeNone string = "None"
-
        // SubscriptionInstanceTimeoutTypeE2Timeout captures enum value "E2-Timeout"
        SubscriptionInstanceTimeoutTypeE2Timeout string = "E2-Timeout"
 
@@ -260,12 +172,12 @@ func (m *SubscriptionInstance) validateTimeoutTypeEnum(path, location string, va
 
 func (m *SubscriptionInstance) validateTimeoutType(formats strfmt.Registry) error {
 
-       if err := validate.Required("TimeoutType", "body", m.TimeoutType); err != nil {
-               return err
+       if swag.IsZero(m.TimeoutType) { // not required
+               return nil
        }
 
        // value enum
-       if err := m.validateTimeoutTypeEnum("TimeoutType", "body", *m.TimeoutType); err != nil {
+       if err := m.validateTimeoutTypeEnum("TimeoutType", "body", m.TimeoutType); err != nil {
                return err
        }