Fix problem in generation of securityapi

Issue-ID: NONRTRIC-814
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: I7f12e05a195957e4360fb1ca7ec881c8da3917ff

diff --git a/capifcore/generate.sh b/capifcore/generate.sh
index ffe7299..9ef282d 100755 (executable)
--- a/capifcore/generate.sh
+++ b/capifcore/generate.sh
@@ -83,6 +83,9 @@ 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
 
+sed '/oneOf.*/,+2d' TS29222_CAPIF_Security_API.yaml >temp.yaml
+mv temp.yaml TS29222_CAPIF_Security_API.yaml
+
 # Replace references to external specs that are collected to the common spec by the commoncollector
 # <replacements_start>
 cat TS29122_CommonData.yaml | sed 's/TS29572_Nlmf_Location/CommonData/g' > temp.yaml

diff --git a/capifcore/internal/securityapi/securityapi-server.gen.go b/capifcore/internal/securityapi/securityapi-server.gen.go
index 1fbde0b..284c4b0 100644 (file)
--- a/capifcore/internal/securityapi/securityapi-server.gen.go
+++ b/capifcore/internal/securityapi/securityapi-server.gen.go
@@ -200,46 +200,45 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-       "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",
-       "AAAA///vfrHakDgAAA==",
+       "H4sIAAAAAAAC/+xa/W7bOBJ/FUJ7wLaAItlu0m79n5u4hRe7qRE52wO2hUFLY5sbiVRJyk4u8APda9yT",
+       "HUhKsiRL/og3ve6tgaKxZc5wPn8zHPHR8lkUMwpUCqv7aAl/DhHWH3u+D0KM2B3QPufqSQDC5ySWhFGr",
+       "a91AzEEoQoQpAs4ZR4QiOQeENSmSihZx+JqAkI5lWzFnMXBJQG+gSfQHmkRW93eL0AUOSTBOKSw7f+KH",
+       "BGjxwYxj/T2hOJFzxsm/oLAqoSKJY8YlpCvH8iGGArnwWQzWF9vSz7uWkJzQmbWyjVDjkqaPTasSTmp+",
+       "XdmWUoBwCJRSRsv1VmzyB/hSMSkY+Aa+bjVwk1ERoVPGI6wolIHNF6tr3Z8tl8sz9fUs4SFQnwUQbHjA",
+       "GGxMglol018F+Bxk7YqCbQtuTOl8DgFQSXAoai1tfLDTfiX/rQXeZVARH2pQETMqoGrRssEMyViTbPL/",
+       "+ZOHLlkUY18iDzjBoQpLxLNtNVPEpkgtFGRGIUA/ex+vkVEBvSgocBliEomXn6lVF6T3MeEgxkQL8Q8O",
+       "U6trjbzO23anM75kUcToFZbYecBR+IO7znA3TW/3KuFaGA/8ba6wLa3phoffAebAa7xa8V3JXCVmJR3q",
+       "fHmJEwGbJh4yIcgkBLTAYQICYQ7dz/QMffytf/PL4NfBaHzr9T70u2g0B8Rhwfzc6NrlKViUHvaGA0To",
+       "gt0BR0SgIAEkmf6FLYCHJCISJQLPICMQwBfE14Rq79vr/j+H/ctR/2p80+95H6//hN0TCvcx+FKHDxaM",
+       "OjoSMgdU1LVsa0OI2pzzwE84kQ+DdZDvTBNCJfAp9gEFIDEJFdwHqR0MNxSBnLOgJl1gOgg2NxhoXJgS",
+       "4EUjwH3MBKEzNE2or1fWKIBjUsdRGzHnWkuYyLn63XhE6V/DpbQGcQixckABEZo4515tZrx2/J58c7tf",
+       "GbNXUr2jUr03HLwfD5NJSMR87JmwHPeGg+bMH6y5riVcKcfBNIuOX7U7xaYeXtnhAikq4BwCNHnYiOYp",
+       "44Vn6bYqSIiE6E9SpyyyUiQidGD4t3OjYs7xgwY6CCsUzyJFBQbrbFuHedmaa6bi2N+dngpi7iCoAAst",
+       "kGc5u3duejr+smR6UJ+1D/vvncZ8FPukeAE0iyGwwXGr/9R2JroOkb0Qk1ikdTeNV+1s5DMOOezU6uln",
+       "5SgNltowMDVrowgWZc4tlrGsjwNtqiwcdiJ0hsu5pUtZqvMQsD8vuqCQkOjTHCgi1A+ToDaRbURUoxmo",
+       "kAKz4zrv0z3YNN+2gWGNpWsYV2WXDE0AJQKCHE7qtdDlsRzhxTy4AiEJzTPqCS3TLSdW6lkQcgRCbk9T",
+       "D6RuI3gCygTFIJQs798bLKOWCKABwkiqZaWUxgIFMCVUlxD1zw9VKKE3zmsHpdtOcSgAMY5YRKQqNkzO",
+       "gS+JSC2VxtyEsRAwNdC4bg2UNlWQ3gp8xX7C5DCJVKdSB8HZyew9YJlwqBaCizftvfzhbfBZ2dYSJoL5",
+       "d9ozl4xOyeyJ3v60yaia1yWD2Y3RtpngK93BS+AUh1fMr0HPVx+GQzTyUOet0+l00G/tN86F00JGcB1K",
+       "7zmOYMn4nU4Lvf6acTmfsIQGaoVCmISHVteaSxmLrusul0vn1SyOHcZn7lTGrheDL1zM/TlZgNt5OxbA",
+       "CQjX7OqaHqS2nRkO9LYmcNcpiymeQQRUOgh9pv/5N+q0Oh3bSPeRzzBNKxQO0RBzSYEL9KJ3M3hno95o",
+       "4Nno8tLr2ag/8gY2GnlX+s+op/67fKl59sIQcTKb69qngACCNJ6JDJWNTfHOwnJsis0CuDCSt52O01KK",
+       "sRgojomytdNyWgo7sJxrV7ipQsoUj7mTg5Wbn/piJvR5WIGN6foCczSRXk6aZ0YwSk8/MVY+k8CF1f19",
+       "e73EVMPiggQJDovQoUcYVlcLq2IOR7pM5XtZxRBV0GOnE526c/aXHM3esUBXGZ9RCVTrhuM4TKPZrR8m",
+       "5NOiXSBRmXOsyomkpNQPzPlbu6DTam0R5w9h8Pbw3UVsdq8gdaKXTJMQmcVIr0Y36RhqZVuvWm8OBJJc",
+       "H1fRahY/HcHiJ8Xi/HnM0ue8ziz94kSvyTDnrfY3FOm2MO0zu786sHqsbapoNYvzI1icaxbt9tNZtNuG",
+       "xRGKtI0i7YsjWFxoFp23T2fReatYXJgQfRILRatZvDqChbZFAFOchPLJbDL6lY5BV/JESAjSLl64j8WW",
+       "fmXqYwgSNmvClX4+KtP3ygeC56sLlZPHgZWhhMfnm13ANUOXJu3RiwKEalMU5ltwT1QzNEMimeTkL787",
+       "UH0Si3MTsSkIPpFFux7JDmHRgGSHsDivB4ADWDQBwP4sGgHgEBZbAGB/NgUAsK0Z1HR7H0D+5dLaroqh",
+       "D+rCnBh/VNQ/1hzJtx1Ps6l2YWpamGrWjLj3PqBqvb8mwB8Kim/OcGvUzc+0z6jvetj2zOqWB8tbtf3y",
+       "jE10dSJV05uNitObmhF30Tpp+KIJFsoUpsXMRiJTzqLmlwLKXKfa8T3WjtbrI1i8Ni3sEVK0TxWssYLF",
+       "iWbk4zCcYP9u13T0MbuyMWHBww9uw8pVcRSy3yDhUNCpeR2y1/RgR7cq1t1qUbdTU/p9Akv7CEWajteH",
+       "sGg4Xh/C4uKETQ3H65UZxhbnqIn8ax6YnwMBd7ZdPgcsAeF176V3vpd6Qo9pReldyNn+lrIXpgZGDX2F",
+       "ZA440L59tH5hTW/XFJZjQk3HfnszyLpLCsvwIeOGOAiWcB9shH2f8UC/ETZXe4TkiS8TDugRx+SGMbly",
+       "fRyT6VlmSHfR3jH50Z37/kGy+r8C9u8ElY/vGE/A/izAvnNu6q6Hps0v1LZUAjNb/ZvVg6aOuHo/RAm9",
+       "351DVSZ6w4G+IfSEvrqA4eltJOfURp/a6FMb/b2hbRIH+Ai0vTXkp+67/EJaW6V8cy3rv1+AM3MQhzMK",
+       "MybJxrr0Du3LfYC39T9qy03QnCD9BOknSP/mkxHb0jfcUqA1l/m2HFYt21pgTvAkTC94m5WmZUvFyi8D",
+       "wj2O4hAcn0VWNf9Twso90/yS6YWC9vINRUcJ/GX13wAAAP//VbZhM004AAA=",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

diff --git a/capifcore/internal/securityapi/securityapi-types.gen.go b/capifcore/internal/securityapi/securityapi-types.gen.go
index bf8723a..78bced7 100644 (file)
--- a/capifcore/internal/securityapi/securityapi-types.gen.go
+++ b/capifcore/internal/securityapi/securityapi-types.gen.go
@@ -6,6 +6,7 @@ package securityapi
 import (
        externalRef0 "oransc.org/nonrtric/capifcore/internal/common29122"
        externalRef1 "oransc.org/nonrtric/capifcore/internal/common29571"
+       externalRef2 "oransc.org/nonrtric/capifcore/internal/publishserviceapi"
 )
 
 // Defines values for AccessTokenErrError.
@@ -81,7 +82,31 @@ type AccessTokenRspTokenType string
 type Cause string
 
 // Represents the interface details and the security method.
-type SecurityInformation interface{}
+type SecurityInformation struct {
+       // Identifier of the API exposing function
+       AefId *string `json:"aefId,omitempty"`
+
+       // API identifier
+       ApiId *string `json:"apiId,omitempty"`
+
+       // Authentication related information
+       AuthenticationInfo *string `json:"authenticationInfo,omitempty"`
+
+       // Authorization related information
+       AuthorizationInfo *string `json:"authorizationInfo,omitempty"`
+
+       // Represents the description of an API's interface.
+       InterfaceDetails *externalRef2.InterfaceDescription `json:"interfaceDetails,omitempty"`
+
+       // Security methods preferred by the API invoker for the API interface.
+       PrefSecurityMethods []externalRef2.SecurityMethod `json:"prefSecurityMethods"`
+
+       // Possible values are:
+       // - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122
+       // - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122
+       // - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+       SelSecurityMethod *externalRef2.SecurityMethod `json:"selSecurityMethod,omitempty"`
+}
 
 // Represents revoked authorization notification details.
 type SecurityNotification struct {