Remove oneof required attributes
Change-Id: Ie483bb9fdec73430d9f8e02c4b997f3fe6de1897
diff --git a/capif/generate.sh b/capif/generate.sh
index a4d4bcb..8d0c01e 100755
--- a/capif/generate.sh
+++ b/capif/generate.sh
@@ -40,6 +40,8 @@
mv temp.yaml TS29571_CommonData.yaml
sed '/accessTokenRequest.*/,+3d' TS29571_CommonData.yaml >temp.yaml
mv temp.yaml TS29571_CommonData.yaml
+sed '/oneOf.*/,+2d' TS29222_CAPIF_Publish_Service_API.yaml >temp.yaml
+mv temp.yaml TS29222_CAPIF_Publish_Service_API.yaml
cd $cwd
diff --git a/capif/internal/readonly/publishserviceapi/publishservice-server.gen.go b/capif/internal/readonly/publishserviceapi/publishservice-server.gen.go
index 048b1c4..1e7d809 100644
--- a/capif/internal/readonly/publishserviceapi/publishservice-server.gen.go
+++ b/capif/internal/readonly/publishserviceapi/publishservice-server.gen.go
@@ -187,51 +187,50 @@
// Base64 encoded, gzipped, json marshaled Swagger object
var swaggerSpec = []string{
- "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",
+ "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",
}
// GetSwagger returns the content of the embedded swagger specification file
diff --git a/capif/internal/readonly/publishserviceapi/publishservice-types.gen.go b/capif/internal/readonly/publishserviceapi/publishservice-types.gen.go
index 8448c7e..f474139 100644
--- a/capif/internal/readonly/publishserviceapi/publishservice-types.gen.go
+++ b/capif/internal/readonly/publishserviceapi/publishservice-types.gen.go
@@ -4,11 +4,33 @@
package publishserviceapi
import (
+ externalRef0 "oransc.org/nonrtric/plt/capif/internal/readonly/common"
externalRef1 "oransc.org/nonrtric/plt/capif/internal/readonly/common29571"
)
// AefProfile defines model for AefProfile.
-type AefProfile interface{}
+type AefProfile struct {
+ // Identifier of the API exposing function
+ AefId string `json:"aefId"`
+
+ // Possible values are - JSON: JavaScript Object Notation
+ DataFormat *DataFormat `json:"dataFormat,omitempty"`
+
+ // Domain to which API belongs to
+ DomainName *string `json:"domainName,omitempty"`
+
+ // Interface details
+ InterfaceDescriptions *[]InterfaceDescription `json:"interfaceDescriptions,omitempty"`
+
+ // Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+ Protocol *Protocol `json:"protocol,omitempty"`
+
+ // Security methods supported by the AEF
+ SecurityMethods *[]SecurityMethod `json:"securityMethods,omitempty"`
+
+ // API version
+ Versions []Version `json:"versions"`
+}
// Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
type CommunicationType interface{}
@@ -32,7 +54,19 @@
type DataFormat interface{}
// InterfaceDescription defines model for InterfaceDescription.
-type InterfaceDescription interface{}
+type InterfaceDescription struct {
+ // string identifying a Ipv4 address formatted in the "dotted decimal" notation as defined in IETF RFC 1166.
+ Ipv4Addr *externalRef0.Ipv4Addr `json:"ipv4Addr,omitempty"`
+
+ // string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.
+ Ipv6Addr *externalRef0.Ipv6Addr `json:"ipv6Addr,omitempty"`
+
+ // Unsigned integer with valid values between 0 and 65535.
+ Port *externalRef0.Port `json:"port,omitempty"`
+
+ // Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.
+ SecurityMethods *[]SecurityMethod `json:"securityMethods,omitempty"`
+}
// Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
type Operation interface{}