X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fmodels%2Fsubscription_params.go;h=5616e984b0c406e537226e6d43730e7bc3ebf62d;hb=refs%2Fchanges%2F40%2F6340%2F1;hp=eb2d17178f4dd79dc2a4eef5b0ecaca9c67abf6d;hpb=3602bf801fef17e317cb35a4c710118ec80908b9;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/models/subscription_params.go b/pkg/models/subscription_params.go
index eb2d171..5616e98 100644
--- a/pkg/models/subscription_params.go
+++ b/pkg/models/subscription_params.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"
 )
 
 // SubscriptionParams subscription params
+//
 // swagger:model SubscriptionParams
 type SubscriptionParams struct {
 
@@ -21,12 +21,6 @@ type SubscriptionParams struct {
 	// Required: true
 	ClientEndpoint *SubscriptionParamsClientEndpoint `json:"ClientEndpoint"`
 
-	// instance Id
-	// Required: true
-	// Maximum: 65535
-	// Minimum: 0
-	InstanceID *int64 `json:"InstanceId"`
-
 	// meid
 	// Required: true
 	Meid *string `json:"Meid"`
@@ -37,15 +31,12 @@ type SubscriptionParams struct {
 	// Minimum: 0
 	RANFunctionID *int64 `json:"RANFunctionID"`
 
-	// requestor Id
-	// Required: true
-	// Maximum: 65535
-	// Minimum: 0
-	RequestorID *int64 `json:"RequestorId"`
-
 	// subscription details
 	// Required: true
 	SubscriptionDetails SubscriptionDetailsList `json:"SubscriptionDetails"`
+
+	// Optional subscription ID (Submgr allocates if not given)
+	SubscriptionID string `json:"SubscriptionId,omitempty"`
 }
 
 // Validate validates this subscription params
@@ -56,10 +47,6 @@ func (m *SubscriptionParams) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateInstanceID(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateMeid(formats); err != nil {
 		res = append(res, err)
 	}
@@ -68,10 +55,6 @@ func (m *SubscriptionParams) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateRequestorID(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateSubscriptionDetails(formats); err != nil {
 		res = append(res, err)
 	}
@@ -100,23 +83,6 @@ func (m *SubscriptionParams) validateClientEndpoint(formats strfmt.Registry) err
 	return nil
 }
 
-func (m *SubscriptionParams) 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 *SubscriptionParams) validateMeid(formats strfmt.Registry) error {
 
 	if err := validate.Required("Meid", "body", m.Meid); err != nil {
@@ -143,23 +109,6 @@ func (m *SubscriptionParams) validateRANFunctionID(formats strfmt.Registry) erro
 	return nil
 }
 
-func (m *SubscriptionParams) validateRequestorID(formats strfmt.Registry) error {
-
-	if err := validate.Required("RequestorId", "body", m.RequestorID); err != nil {
-		return err
-	}
-
-	if err := validate.MinimumInt("RequestorId", "body", int64(*m.RequestorID), 0, false); err != nil {
-		return err
-	}
-
-	if err := validate.MaximumInt("RequestorId", "body", int64(*m.RequestorID), 65535, false); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (m *SubscriptionParams) validateSubscriptionDetails(formats strfmt.Registry) error {
 
 	if err := validate.Required("SubscriptionDetails", "body", m.SubscriptionDetails); err != nil {
@@ -195,23 +144,33 @@ func (m *SubscriptionParams) UnmarshalBinary(b []byte) error {
 }
 
 // SubscriptionParamsClientEndpoint xApp service address and port
+//
 // swagger:model SubscriptionParamsClientEndpoint
 type SubscriptionParamsClientEndpoint struct {
 
-	// xApp service address port
+	// xApp HTTP service address port
 	// Maximum: 65535
 	// Minimum: 0
-	Port *int64 `json:"Port,omitempty"`
+	HTTPPort *int64 `json:"HTTPPort,omitempty"`
 
 	// xApp service address name like 'service-ricxapp-xappname-http.ricxapp'
-	ServiceName string `json:"ServiceName,omitempty"`
+	Host string `json:"Host,omitempty"`
+
+	// xApp RMR service address port
+	// Maximum: 65535
+	// Minimum: 0
+	RMRPort *int64 `json:"RMRPort,omitempty"`
 }
 
 // Validate validates this subscription params client endpoint
 func (m *SubscriptionParamsClientEndpoint) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validatePort(formats); err != nil {
+	if err := m.validateHTTPPort(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateRMRPort(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -221,17 +180,34 @@ func (m *SubscriptionParamsClientEndpoint) Validate(formats strfmt.Registry) err
 	return nil
 }
 
-func (m *SubscriptionParamsClientEndpoint) validatePort(formats strfmt.Registry) error {
+func (m *SubscriptionParamsClientEndpoint) validateHTTPPort(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.HTTPPort) { // not required
+		return nil
+	}
+
+	if err := validate.MinimumInt("ClientEndpoint"+"."+"HTTPPort", "body", int64(*m.HTTPPort), 0, false); err != nil {
+		return err
+	}
+
+	if err := validate.MaximumInt("ClientEndpoint"+"."+"HTTPPort", "body", int64(*m.HTTPPort), 65535, false); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *SubscriptionParamsClientEndpoint) validateRMRPort(formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Port) { // not required
+	if swag.IsZero(m.RMRPort) { // not required
 		return nil
 	}
 
-	if err := validate.MinimumInt("ClientEndpoint"+"."+"Port", "body", int64(*m.Port), 0, false); err != nil {
+	if err := validate.MinimumInt("ClientEndpoint"+"."+"RMRPort", "body", int64(*m.RMRPort), 0, false); err != nil {
 		return err
 	}
 
-	if err := validate.MaximumInt("ClientEndpoint"+"."+"Port", "body", int64(*m.Port), 65535, false); err != nil {
+	if err := validate.MaximumInt("ClientEndpoint"+"."+"RMRPort", "body", int64(*m.RMRPort), 65535, false); err != nil {
 		return err
 	}