Code Review
/
nonrtric
/
plt
/
sme.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
8fcfa4e
)
Move capifcore code to separate folder
25/9325/2
author
elinuxhenrik
<henrik.b.andersson@est.tech>
Wed, 19 Oct 2022 14:25:12 +0000
(16:25 +0200)
committer
elinuxhenrik
<henrik.b.andersson@est.tech>
Thu, 20 Oct 2022 11:02:49 +0000
(13:02 +0200)
Issue-ID: NONRTRIC-812
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: Ie9db2d9d10a6a0da31bad7fdebf0b59eaf8235e3
89 files changed:
capifcore/.gitignore
[moved from
.gitignore
with 72% similarity]
patch
|
blob
|
history
capifcore/Dockerfile
[moved from
Dockerfile
with 97% similarity]
patch
|
blob
|
history
capifcore/README.md
[moved from
README.md
with 100% similarity]
patch
|
blob
|
history
capifcore/build-capifcore-ubuntu.sh
[moved from
build-sme-ubuntu.sh
with 75% similarity]
patch
|
blob
|
history
capifcore/container-tag.yaml
[moved from
container-tag.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/generate.sh
[moved from
generate.sh
with 100% similarity]
patch
|
blob
|
history
capifcore/go.mod
[moved from
go.mod
with 99% similarity]
patch
|
blob
|
history
capifcore/go.sum
[moved from
go.sum
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
with 92% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
with 85% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
with 92% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
with 79% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/auditingapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/auditingapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/auditingapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/auditingapi/generator_settings_server.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/auditingapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/auditingapi/generator_settings_types.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/common/generator_settings.yaml
[moved from
gogeneratorspecs/common/generator_settings.yaml
with 92% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/common29122/generator_settings.yaml
[moved from
gogeneratorspecs/common29122/generator_settings.yaml
with 86% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/common29571/generator_settings.yaml
[moved from
gogeneratorspecs/common29571/generator_settings.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/eventsapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/eventsapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/eventsapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/eventsapi/generator_settings_server.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/eventsapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/eventsapi/generator_settings_types.yaml
with 67% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/loggingapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/loggingapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/loggingapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/loggingapi/generator_settings_server.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/loggingapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/loggingapi/generator_settings_types.yaml
with 77% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
with 85% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
with 85% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
with 80% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
with 80% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
with 74% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/securityapi/generator_settings_client.yaml
[moved from
gogeneratorspecs/securityapi/generator_settings_client.yaml
with 100% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/securityapi/generator_settings_server.yaml
[moved from
gogeneratorspecs/securityapi/generator_settings_server.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/gogeneratorspecs/securityapi/generator_settings_types.yaml
[moved from
gogeneratorspecs/securityapi/generator_settings_types.yaml
with 78% similarity]
patch
|
blob
|
history
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
[moved from
internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
with 93% similarity]
patch
|
blob
|
history
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
[moved from
internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
with 99% similarity]
patch
|
blob
|
history
capifcore/internal/aefsecurityapi/aefsecurityapi-server.gen.go
[moved from
internal/aefsecurityapi/aefsecurityapi-server.gen.go
with 99% similarity]
patch
|
blob
|
history
capifcore/internal/aefsecurityapi/aefsecurityapi-types.gen.go
[moved from
internal/aefsecurityapi/aefsecurityapi-types.gen.go
with 97% similarity]
patch
|
blob
|
history
capifcore/internal/auditingapi/auditingapi-server.gen.go
[moved from
internal/auditingapi/auditingapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/auditingapi/auditingapi-types.gen.go
[moved from
internal/auditingapi/auditingapi-types.gen.go
with 90% similarity]
patch
|
blob
|
history
capifcore/internal/common/common.gen.go
[moved from
internal/common/common.gen.go
with 99% similarity]
patch
|
blob
|
history
capifcore/internal/common29122/common29122.gen.go
[moved from
internal/common29122/common29122.gen.go
with 99% similarity]
patch
|
blob
|
history
capifcore/internal/common29571/common29571.gen.go
[moved from
internal/common29571/common29571.gen.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/discoverservice/discoverservice.go
[moved from
internal/discoverservice/discoverservice.go
with 92% similarity]
patch
|
blob
|
history
capifcore/internal/discoverservice/discoverservice_test.go
[moved from
internal/discoverservice/discoverservice_test.go
with 94% similarity]
patch
|
blob
|
history
capifcore/internal/discoverserviceapi/discoverserviceapi-server.gen.go
[moved from
internal/discoverserviceapi/discoverserviceapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/discoverserviceapi/discoverserviceapi-types.gen.go
[moved from
internal/discoverserviceapi/discoverserviceapi-types.gen.go
with 93% similarity]
patch
|
blob
|
history
capifcore/internal/eventsapi/eventsapi-server.gen.go
[moved from
internal/eventsapi/eventsapi-server.gen.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/eventsapi/eventsapi-types.gen.go
[moved from
internal/eventsapi/eventsapi-types.gen.go
with 94% similarity]
patch
|
blob
|
history
capifcore/internal/gentools/commoncollector/commoncollector.go
[moved from
internal/gentools/commoncollector/commoncollector.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/gentools/commoncollector/definitions.txt
[moved from
internal/gentools/commoncollector/definitions.txt
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/gentools/enumfixer/enumfixer.go
[moved from
internal/gentools/enumfixer/enumfixer.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/gentools/specificationfixer/specificationfixer.go
[moved from
internal/gentools/specificationfixer/specificationfixer.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/helmmanagement/helm.go
[moved from
internal/helmmanagement/helm.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/helmmanagement/mocks/HelmManager.go
[moved from
internal/helmmanagement/mocks/HelmManager.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/invokermanagement/invokermanagement.go
[moved from
internal/invokermanagement/invokermanagement.go
with 95% similarity]
patch
|
blob
|
history
capifcore/internal/invokermanagement/invokermanagement_test.go
[moved from
internal/invokermanagement/invokermanagement_test.go
with 89% similarity]
patch
|
blob
|
history
capifcore/internal/invokermanagement/mocks/InvokerRegister.go
[moved from
internal/invokermanagement/mocks/InvokerRegister.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/invokermanagementapi/invokermanagementapi-server.gen.go
[moved from
internal/invokermanagementapi/invokermanagementapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/invokermanagementapi/invokermanagementapi-types.gen.go
[moved from
internal/invokermanagementapi/invokermanagementapi-types.gen.go
with 96% similarity]
patch
|
blob
|
history
capifcore/internal/loggingapi/loggingapi-server.gen.go
[moved from
internal/loggingapi/loggingapi-server.gen.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/loggingapi/loggingapi-types.gen.go
[moved from
internal/loggingapi/loggingapi-types.gen.go
with 95% similarity]
patch
|
blob
|
history
capifcore/internal/providermanagement/mocks/ServiceRegister.go
[moved from
internal/providermanagement/mocks/ServiceRegister.go
with 100% similarity]
patch
|
blob
|
history
capifcore/internal/providermanagement/providermanagement.go
[moved from
internal/providermanagement/providermanagement.go
with 97% similarity]
patch
|
blob
|
history
capifcore/internal/providermanagement/providermanagement_test.go
[moved from
internal/providermanagement/providermanagement_test.go
with 97% similarity]
patch
|
blob
|
history
capifcore/internal/providermanagementapi/providermanagementapi-server.gen.go
[moved from
internal/providermanagementapi/providermanagementapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/providermanagementapi/providermanagementapi-types.gen.go
[moved from
internal/providermanagementapi/providermanagementapi-types.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/publishservice/mocks/APIRegister.go
[moved from
internal/publishservice/mocks/APIRegister.go
with 95% similarity]
patch
|
blob
|
history
capifcore/internal/publishservice/publishservice.go
[moved from
internal/publishservice/publishservice.go
with 96% similarity]
patch
|
blob
|
history
capifcore/internal/publishservice/publishservice_test.go
[moved from
internal/publishservice/publishservice_test.go
with 93% similarity]
patch
|
blob
|
history
capifcore/internal/publishserviceapi/publishserviceapi-server.gen.go
[moved from
internal/publishserviceapi/publishserviceapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/publishserviceapi/publishserviceapi-types.gen.go
[moved from
internal/publishserviceapi/publishserviceapi-types.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/routinginfoapi/routinginfoapi-server.gen.go
[moved from
internal/routinginfoapi/routinginfoapi-server.gen.go
with 97% similarity]
patch
|
blob
|
history
capifcore/internal/routinginfoapi/routinginfoapi-types.gen.go
[moved from
internal/routinginfoapi/routinginfoapi-types.gen.go
with 84% similarity]
patch
|
blob
|
history
capifcore/internal/security/security.go
[moved from
internal/security/security.go
with 92% similarity]
patch
|
blob
|
history
capifcore/internal/security/security_test.go
[moved from
internal/security/security_test.go
with 87% similarity]
patch
|
blob
|
history
capifcore/internal/securityapi/securityapi-server.gen.go
[moved from
internal/securityapi/securityapi-server.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/internal/securityapi/securityapi-types.gen.go
[moved from
internal/securityapi/securityapi-types.gen.go
with 98% similarity]
patch
|
blob
|
history
capifcore/main.go
[moved from
main.go
with 88% similarity]
patch
|
blob
|
history
capifcore/main_test.go
[moved from
main_test.go
with 100% similarity]
patch
|
blob
|
history
diff --git
a/.gitignore
b/capifcore/.gitignore
similarity index 72%
rename from
.gitignore
rename to
capifcore/.gitignore
index
7dc4002
..
db1fbad
100644
(file)
--- a/
.gitignore
+++ b/
capifcore/.gitignore
@@
-3,5
+3,5
@@
specs
commoncollector
enumfixer
specificationfixer
commoncollector
enumfixer
specificationfixer
-
sm
e
+
capifcor
e
coverage.txt
\ No newline at end of file
coverage.txt
\ No newline at end of file
diff --git
a/Dockerfile
b/capifcore/Dockerfile
similarity index 97%
rename from
Dockerfile
rename to
capifcore/Dockerfile
index
56c939b
..
ed97579
100644
(file)
--- a/
Dockerfile
+++ b/
capifcore/Dockerfile
@@
-35,4
+35,4
@@
WORKDIR /
## Copy from "build" stage
COPY --from=build /capifcore .
USER nonroot:nonroot
## Copy from "build" stage
COPY --from=build /capifcore .
USER nonroot:nonroot
-ENTRYPOINT ["/capif"]
+ENTRYPOINT ["/capif
core
"]
diff --git
a/README.md
b/capifcore/README.md
similarity index 100%
rename from
README.md
rename to
capifcore/README.md
diff --git
a/build-sme-ubuntu.sh
b/capifcore/build-capifcore-ubuntu.sh
similarity index 75%
rename from
build-sme-ubuntu.sh
rename to
capifcore/build-capifcore-ubuntu.sh
index
ace8876
..
0973e2a
100755
(executable)
--- a/
build-sme-ubuntu.sh
+++ b/
capifcore/build-capifcore-ubuntu.sh
@@
-18,7
+18,7
@@
##############################################################################
set -eux
##############################################################################
set -eux
-echo "--> build-
sm
e-ubuntu.sh"
+echo "--> build-
capifcor
e-ubuntu.sh"
# go installs tools like go-acc to $HOME/go/bin
# ubuntu minion path lacks go
export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
# go installs tools like go-acc to $HOME/go/bin
# ubuntu minion path lacks go
export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
@@
-30,8
+30,8
@@
go get -v github.com/ory/go-acc
export GO111MODULE=on
go get github.com/stretchr/testify/mock@v1.7.1
export GO111MODULE=on
go get github.com/stretchr/testify/mock@v1.7.1
-go-acc ./... --ignore
mocks,api,common
+go-acc ./... --ignore
gentools,mocks,common,accesscontrolpolicyapi,aefsecurityapi,auditingapi,discoverserviceapi,eventsapi,invokermanagementapi,loggingapi,securityapi,publishserviceapi,routinginfoapi
-sed -i -e 's/oransc\.org\/nonrtric\/
sme/sm
e/' coverage.txt
+sed -i -e 's/oransc\.org\/nonrtric\/
capifcore/capifcor
e/' coverage.txt
-echo "--> build-
sm
e-ubuntu.sh ends"
+echo "--> build-
capifcor
e-ubuntu.sh ends"
diff --git
a/container-tag.yaml
b/capifcore/container-tag.yaml
similarity index 100%
rename from
container-tag.yaml
rename to
capifcore/container-tag.yaml
diff --git
a/generate.sh
b/capifcore/generate.sh
similarity index 100%
rename from
generate.sh
rename to
capifcore/generate.sh
diff --git
a/go.mod
b/capifcore/go.mod
similarity index 99%
rename from
go.mod
rename to
capifcore/go.mod
index
cc2573a
..
f19186b
100644
(file)
--- a/
go.mod
+++ b/
capifcore/go.mod
@@
-1,4
+1,4
@@
-module oransc.org/nonrtric/
sm
e
+module oransc.org/nonrtric/
capifcor
e
go 1.19
go 1.19
diff --git
a/go.sum
b/capifcore/go.sum
similarity index 100%
rename from
go.sum
rename to
capifcore/go.sum
diff --git
a/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
similarity index 92%
rename from
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
index
43c0a7e
..
cd68b9f
100644
(file)
--- a/
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_server.yaml
@@
-25,4
+25,4
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
diff --git
a/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
similarity index 85%
rename from
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
index
13feeef
..
4fafacf
100644
(file)
--- a/
gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/accesscontrolpolicyapi/generator_settings_types.yaml
@@
-24,5
+24,5
@@
package: accesscontrolpolicyapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
\ No newline at end of file
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
\ No newline at end of file
diff --git
a/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
similarity index 92%
rename from
gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
index
c889486
..
2363b0d
100644
(file)
--- a/
gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_server.yaml
@@
-25,4
+25,4
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
diff --git
a/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
similarity index 79%
rename from
gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
index
f35eb9d
..
db8aa2f
100644
(file)
--- a/
gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/aefsecurityapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: aefsecurityapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29222_CAPIF_Security_API.yaml: oransc.org/nonrtric/
sm
e/internal/securityapi
\ No newline at end of file
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29222_CAPIF_Security_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/securityapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/auditingapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/auditingapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/auditingapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/auditingapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/auditingapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/auditingapi/generator_settings_server.yaml
similarity index 78%
rename from
gogeneratorspecs/auditingapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/auditingapi/generator_settings_server.yaml
index
2984a2b
..
9306c5e
100644
(file)
--- a/
gogeneratorspecs/auditingapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/auditingapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/auditingapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/auditingapi/generator_settings_types.yaml
similarity index 78%
rename from
gogeneratorspecs/auditingapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/auditingapi/generator_settings_types.yaml
index
4c16309
..
5d864ec
100644
(file)
--- a/
gogeneratorspecs/auditingapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/auditingapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: auditingapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/common/generator_settings.yaml
b/capifcore/gogeneratorspecs/common/generator_settings.yaml
similarity index 92%
rename from
gogeneratorspecs/common/generator_settings.yaml
rename to
capifcore/gogeneratorspecs/common/generator_settings.yaml
index
df0b7c1
..
e2c6888
100644
(file)
--- a/
gogeneratorspecs/common/generator_settings.yaml
+++ b/
capifcore/gogeneratorspecs/common/generator_settings.yaml
@@
-26,4
+26,4
@@
generate:
- skip-prune
- spec
import-mapping:
- skip-prune
- spec
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
diff --git
a/gogeneratorspecs/common29122/generator_settings.yaml
b/capifcore/gogeneratorspecs/common29122/generator_settings.yaml
similarity index 86%
rename from
gogeneratorspecs/common29122/generator_settings.yaml
rename to
capifcore/gogeneratorspecs/common29122/generator_settings.yaml
index
469bc5b
..
cbe5aad
100644
(file)
--- a/
gogeneratorspecs/common29122/generator_settings.yaml
+++ b/
capifcore/gogeneratorspecs/common29122/generator_settings.yaml
@@
-26,5
+26,5
@@
generate:
- skip-prune
- spec
import-mapping:
- skip-prune
- spec
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common
\ No newline at end of file
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common
\ No newline at end of file
diff --git
a/gogeneratorspecs/common29571/generator_settings.yaml
b/capifcore/gogeneratorspecs/common29571/generator_settings.yaml
similarity index 100%
rename from
gogeneratorspecs/common29571/generator_settings.yaml
rename to
capifcore/gogeneratorspecs/common29571/generator_settings.yaml
diff --git
a/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
similarity index 78%
rename from
gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
index
4f4b64f
..
869f0a7
100644
(file)
--- a/
gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
similarity index 78%
rename from
gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
index
f2dce51
..
80d9b6e
100644
(file)
--- a/
gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/discoverserviceapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: discoverserviceapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/eventsapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/eventsapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/eventsapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/eventsapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/eventsapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/eventsapi/generator_settings_server.yaml
similarity index 100%
rename from
gogeneratorspecs/eventsapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/eventsapi/generator_settings_server.yaml
diff --git
a/gogeneratorspecs/eventsapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/eventsapi/generator_settings_types.yaml
similarity index 67%
rename from
gogeneratorspecs/eventsapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/eventsapi/generator_settings_types.yaml
index
de4e0fe
..
19416b1
100644
(file)
--- a/
gogeneratorspecs/eventsapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/eventsapi/generator_settings_types.yaml
@@
-24,10
+24,10
@@
package: eventsapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common
- TS29222_CAPIF_Access_Control_Policy_API.yaml: oransc.org/nonrtric/
sm
e/internal/accesscontrolpolicyapi
- TS29222_CAPIF_Logging_API_Invocation_API.yaml: oransc.org/nonrtric/
sm
e/internal/loggingapi
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
- TS29222_CAPIF_Routing_Info_API.yaml: oransc.org/nonrtric/
sm
e/internal/routinginfoapi
\ No newline at end of file
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common
+ TS29222_CAPIF_Access_Control_Policy_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/accesscontrolpolicyapi
+ TS29222_CAPIF_Logging_API_Invocation_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/loggingapi
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
+ TS29222_CAPIF_Routing_Info_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/routinginfoapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
similarity index 78%
rename from
gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
index
505c98a
..
c0a00c3
100644
(file)
--- a/
gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
similarity index 78%
rename from
gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
index
e621841
..
54ddf46
100644
(file)
--- a/
gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/invokermanagementapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: invokermanagementapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/loggingapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/loggingapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/loggingapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/loggingapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/loggingapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/loggingapi/generator_settings_server.yaml
similarity index 100%
rename from
gogeneratorspecs/loggingapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/loggingapi/generator_settings_server.yaml
diff --git
a/gogeneratorspecs/loggingapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/loggingapi/generator_settings_types.yaml
similarity index 77%
rename from
gogeneratorspecs/loggingapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/loggingapi/generator_settings_types.yaml
index
990711e
..
b34c6a9
100644
(file)
--- a/
gogeneratorspecs/loggingapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/loggingapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: loggingapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
similarity index 85%
rename from
gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
index
cad421d
..
e02d295
100644
(file)
--- a/
gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_server.yaml
@@
-25,5
+25,5
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
\ No newline at end of file
diff --git
a/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
similarity index 85%
rename from
gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
index
5dd64f9
..
f22591f
100644
(file)
--- a/
gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/providermanagementapi/generator_settings_types.yaml
@@
-24,5
+24,5
@@
package: providermanagementapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
\ No newline at end of file
diff --git
a/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
similarity index 80%
rename from
gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
index
01e2628
..
c3b4878
100644
(file)
--- a/
gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common
\ No newline at end of file
diff --git
a/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
similarity index 80%
rename from
gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
index
4727683
..
dc5a3b1
100644
(file)
--- a/
gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/publishserviceapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: publishserviceapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common
\ No newline at end of file
diff --git
a/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
similarity index 78%
rename from
gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
index
4863d30
..
af3e82b
100644
(file)
--- a/
gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
similarity index 74%
rename from
gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
index
f9448e3
..
554c0c9
100644
(file)
--- a/
gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/routinginfoapi/generator_settings_types.yaml
@@
-24,7
+24,7
@@
package: routinginfoapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/securityapi/generator_settings_client.yaml
b/capifcore/gogeneratorspecs/securityapi/generator_settings_client.yaml
similarity index 100%
rename from
gogeneratorspecs/securityapi/generator_settings_client.yaml
rename to
capifcore/gogeneratorspecs/securityapi/generator_settings_client.yaml
diff --git
a/gogeneratorspecs/securityapi/generator_settings_server.yaml
b/capifcore/gogeneratorspecs/securityapi/generator_settings_server.yaml
similarity index 78%
rename from
gogeneratorspecs/securityapi/generator_settings_server.yaml
rename to
capifcore/gogeneratorspecs/securityapi/generator_settings_server.yaml
index
5f685ad
..
a53e41f
100644
(file)
--- a/
gogeneratorspecs/securityapi/generator_settings_server.yaml
+++ b/
capifcore/gogeneratorspecs/securityapi/generator_settings_server.yaml
@@
-25,6
+25,6
@@
generate:
- server
- spec
import-mapping:
- server
- spec
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/gogeneratorspecs/securityapi/generator_settings_types.yaml
b/capifcore/gogeneratorspecs/securityapi/generator_settings_types.yaml
similarity index 78%
rename from
gogeneratorspecs/securityapi/generator_settings_types.yaml
rename to
capifcore/gogeneratorspecs/securityapi/generator_settings_types.yaml
index
607fb7f
..
1b75b4d
100644
(file)
--- a/
gogeneratorspecs/securityapi/generator_settings_types.yaml
+++ b/
capifcore/gogeneratorspecs/securityapi/generator_settings_types.yaml
@@
-24,6
+24,6
@@
package: securityapi
generate:
- types
import-mapping:
generate:
- types
import-mapping:
- TS29122_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29122
- TS29571_CommonData.yaml: oransc.org/nonrtric/
sm
e/internal/common29571
- TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
sm
e/internal/publishserviceapi
\ No newline at end of file
+ TS29122_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29122
+ TS29571_CommonData.yaml: oransc.org/nonrtric/
capifcor
e/internal/common29571
+ TS29222_CAPIF_Publish_Service_API.yaml: oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi
\ No newline at end of file
diff --git
a/internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
b/capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
similarity index 93%
rename from
internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
rename to
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
index
6f3247d
..
5a7ac78
100644
(file)
--- a/
internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
+++ b/
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi-types.gen.go
@@
-4,8
+4,8
@@
package accesscontrolpolicyapi
import (
package accesscontrolpolicyapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Represents the access control policy list for a published service API.
)
// Represents the access control policy list for a published service API.
diff --git
a/internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
b/capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
similarity index 99%
rename from
internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
rename to
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
index
d9eff0a
..
0c7807d
100644
(file)
--- a/
internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
+++ b/
capifcore/internal/accesscontrolpolicyapi/accesscontrolpolicyapi.gen.go
@@
-16,7
+16,7
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/aefsecurityapi/aefsecurityapi-server.gen.go
b/capifcore/internal/aefsecurityapi/aefsecurityapi-server.gen.go
similarity index 99%
rename from
internal/aefsecurityapi/aefsecurityapi-server.gen.go
rename to
capifcore/internal/aefsecurityapi/aefsecurityapi-server.gen.go
index
4b7c7ff
..
a001c8a
100644
(file)
--- a/
internal/aefsecurityapi/aefsecurityapi-server.gen.go
+++ b/
capifcore/internal/aefsecurityapi/aefsecurityapi-server.gen.go
@@
-14,7
+14,7
@@
import (
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/aefsecurityapi/aefsecurityapi-types.gen.go
b/capifcore/internal/aefsecurityapi/aefsecurityapi-types.gen.go
similarity index 97%
rename from
internal/aefsecurityapi/aefsecurityapi-types.gen.go
rename to
capifcore/internal/aefsecurityapi/aefsecurityapi-types.gen.go
index
7d60484
..
b9c98d7
100644
(file)
--- a/
internal/aefsecurityapi/aefsecurityapi-types.gen.go
+++ b/
capifcore/internal/aefsecurityapi/aefsecurityapi-types.gen.go
@@
-4,8
+4,8
@@
package aefsecurityapi
import (
package aefsecurityapi
import (
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/securityapi"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/securityapi"
)
// Represents authentication check request data.
)
// Represents authentication check request data.
diff --git
a/internal/auditingapi/auditingapi-server.gen.go
b/capifcore/internal/auditingapi/auditingapi-server.gen.go
similarity index 98%
rename from
internal/auditingapi/auditingapi-server.gen.go
rename to
capifcore/internal/auditingapi/auditingapi-server.gen.go
index
d98bc08
..
782c863
100644
(file)
--- a/
internal/auditingapi/auditingapi-server.gen.go
+++ b/
capifcore/internal/auditingapi/auditingapi-server.gen.go
@@
-17,9
+17,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/auditingapi/auditingapi-types.gen.go
b/capifcore/internal/auditingapi/auditingapi-types.gen.go
similarity index 90%
rename from
internal/auditingapi/auditingapi-types.gen.go
rename to
capifcore/internal/auditingapi/auditingapi-types.gen.go
index
3c840dc
..
ed31e04
100644
(file)
--- a/
internal/auditingapi/auditingapi-types.gen.go
+++ b/
capifcore/internal/auditingapi/auditingapi-types.gen.go
@@
-4,9
+4,9
@@
package auditingapi
import (
package auditingapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// GetApiInvocationLogsParams defines parameters for GetApiInvocationLogs.
)
// GetApiInvocationLogsParams defines parameters for GetApiInvocationLogs.
diff --git
a/internal/common/common.gen.go
b/capifcore/internal/common/common.gen.go
similarity index 99%
rename from
internal/common/common.gen.go
rename to
capifcore/internal/common/common.gen.go
index
e6143ca
..
6e3a50e
100644
(file)
--- a/
internal/common/common.gen.go
+++ b/
capifcore/internal/common/common.gen.go
@@
-13,7
+13,7
@@
import (
"strings"
"github.com/getkin/kin-openapi/openapi3"
"strings"
"github.com/getkin/kin-openapi/openapi3"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Defines values for AfResultStatus.
)
// Defines values for AfResultStatus.
diff --git
a/internal/common29122/common29122.gen.go
b/capifcore/internal/common29122/common29122.gen.go
similarity index 99%
rename from
internal/common29122/common29122.gen.go
rename to
capifcore/internal/common29122/common29122.gen.go
index
08f8f2f
..
3cf0780
100644
(file)
--- a/
internal/common29122/common29122.gen.go
+++ b/
capifcore/internal/common29122/common29122.gen.go
@@
-14,8
+14,8
@@
import (
"time"
"github.com/getkin/kin-openapi/openapi3"
"time"
"github.com/getkin/kin-openapi/openapi3"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Defines values for Event.
)
// Defines values for Event.
diff --git
a/internal/common29571/common29571.gen.go
b/capifcore/internal/common29571/common29571.gen.go
similarity index 100%
rename from
internal/common29571/common29571.gen.go
rename to
capifcore/internal/common29571/common29571.gen.go
diff --git
a/internal/discoverservice/discoverservice.go
b/capifcore/internal/discoverservice/discoverservice.go
similarity index 92%
rename from
internal/discoverservice/discoverservice.go
rename to
capifcore/internal/discoverservice/discoverservice.go
index
1dccf85
..
0c0f431
100644
(file)
--- a/
internal/discoverservice/discoverservice.go
+++ b/
capifcore/internal/discoverservice/discoverservice.go
@@
-23,13
+23,13
@@
package discoverservice
import (
"net/http"
import (
"net/http"
- discoverapi "oransc.org/nonrtric/
sm
e/internal/discoverserviceapi"
+ discoverapi "oransc.org/nonrtric/
capifcor
e/internal/discoverserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- publishapi "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ publishapi "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
type DiscoverService struct {
)
type DiscoverService struct {
diff --git
a/internal/discoverservice/discoverservice_test.go
b/capifcore/internal/discoverservice/discoverservice_test.go
similarity index 94%
rename from
internal/discoverservice/discoverservice_test.go
rename to
capifcore/internal/discoverservice/discoverservice_test.go
index
68067a9
..
5ac0041
100644
(file)
--- a/
internal/discoverservice/discoverservice_test.go
+++ b/
capifcore/internal/discoverservice/discoverservice_test.go
@@
-26,15
+26,15
@@
import (
"os"
"testing"
"os"
"testing"
- "oransc.org/nonrtric/
sm
e/internal/discoverserviceapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/discoverserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- publishapi "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ publishapi "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/publishservice/mocks"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice/mocks"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
diff --git
a/internal/discoverserviceapi/discoverserviceapi-server.gen.go
b/capifcore/internal/discoverserviceapi/discoverserviceapi-server.gen.go
similarity index 98%
rename from
internal/discoverserviceapi/discoverserviceapi-server.gen.go
rename to
capifcore/internal/discoverserviceapi/discoverserviceapi-server.gen.go
index
7cd2107
..
dd029fc
100644
(file)
--- a/
internal/discoverserviceapi/discoverserviceapi-server.gen.go
+++ b/
capifcore/internal/discoverserviceapi/discoverserviceapi-server.gen.go
@@
-16,9
+16,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/discoverserviceapi/discoverserviceapi-types.gen.go
b/capifcore/internal/discoverserviceapi/discoverserviceapi-types.gen.go
similarity index 93%
rename from
internal/discoverserviceapi/discoverserviceapi-types.gen.go
rename to
capifcore/internal/discoverserviceapi/discoverserviceapi-types.gen.go
index
57fea43
..
0c97e15
100644
(file)
--- a/
internal/discoverserviceapi/discoverserviceapi-types.gen.go
+++ b/
capifcore/internal/discoverserviceapi/discoverserviceapi-types.gen.go
@@
-4,8
+4,8
@@
package discoverserviceapi
import (
package discoverserviceapi
import (
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// Represents a list of APIs currently registered in the CAPIF core function and satisfying a number of filter criteria provided by the API consumer.
)
// Represents a list of APIs currently registered in the CAPIF core function and satisfying a number of filter criteria provided by the API consumer.
diff --git
a/internal/eventsapi/eventsapi-server.gen.go
b/capifcore/internal/eventsapi/eventsapi-server.gen.go
similarity index 100%
rename from
internal/eventsapi/eventsapi-server.gen.go
rename to
capifcore/internal/eventsapi/eventsapi-server.gen.go
diff --git
a/internal/eventsapi/eventsapi-types.gen.go
b/capifcore/internal/eventsapi/eventsapi-types.gen.go
similarity index 94%
rename from
internal/eventsapi/eventsapi-types.gen.go
rename to
capifcore/internal/eventsapi/eventsapi-types.gen.go
index
82b333d
..
a984814
100644
(file)
--- a/
internal/eventsapi/eventsapi-types.gen.go
+++ b/
capifcore/internal/eventsapi/eventsapi-types.gen.go
@@
-4,13
+4,13
@@
package eventsapi
import (
package eventsapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/accesscontrolpolicyapi"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef3 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef4 "oransc.org/nonrtric/
sm
e/internal/loggingapi"
- externalRef5 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
- externalRef6 "oransc.org/nonrtric/
sm
e/internal/routinginfoapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/accesscontrolpolicyapi"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef3 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef4 "oransc.org/nonrtric/
capifcor
e/internal/loggingapi"
+ externalRef5 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
+ externalRef6 "oransc.org/nonrtric/
capifcor
e/internal/routinginfoapi"
)
// Defines values for CAPIFEvent.
)
// Defines values for CAPIFEvent.
diff --git
a/internal/gentools/commoncollector/commoncollector.go
b/capifcore/internal/gentools/commoncollector/commoncollector.go
similarity index 100%
rename from
internal/gentools/commoncollector/commoncollector.go
rename to
capifcore/internal/gentools/commoncollector/commoncollector.go
diff --git
a/internal/gentools/commoncollector/definitions.txt
b/capifcore/internal/gentools/commoncollector/definitions.txt
similarity index 100%
rename from
internal/gentools/commoncollector/definitions.txt
rename to
capifcore/internal/gentools/commoncollector/definitions.txt
diff --git
a/internal/gentools/enumfixer/enumfixer.go
b/capifcore/internal/gentools/enumfixer/enumfixer.go
similarity index 100%
rename from
internal/gentools/enumfixer/enumfixer.go
rename to
capifcore/internal/gentools/enumfixer/enumfixer.go
diff --git
a/internal/gentools/specificationfixer/specificationfixer.go
b/capifcore/internal/gentools/specificationfixer/specificationfixer.go
similarity index 100%
rename from
internal/gentools/specificationfixer/specificationfixer.go
rename to
capifcore/internal/gentools/specificationfixer/specificationfixer.go
diff --git
a/internal/helmmanagement/helm.go
b/capifcore/internal/helmmanagement/helm.go
similarity index 100%
rename from
internal/helmmanagement/helm.go
rename to
capifcore/internal/helmmanagement/helm.go
diff --git
a/internal/helmmanagement/mocks/HelmManager.go
b/capifcore/internal/helmmanagement/mocks/HelmManager.go
similarity index 100%
rename from
internal/helmmanagement/mocks/HelmManager.go
rename to
capifcore/internal/helmmanagement/mocks/HelmManager.go
diff --git
a/internal/invokermanagement/invokermanagement.go
b/capifcore/internal/invokermanagement/invokermanagement.go
similarity index 95%
rename from
internal/invokermanagement/invokermanagement.go
rename to
capifcore/internal/invokermanagement/invokermanagement.go
index
571d2a0
..
1d8582d
100644
(file)
--- a/
internal/invokermanagement/invokermanagement.go
+++ b/
capifcore/internal/invokermanagement/invokermanagement.go
@@
-27,12
+27,12
@@
import (
"strings"
"sync"
"strings"
"sync"
- publishapi "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ publishapi "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- invokerapi "oransc.org/nonrtric/
sm
e/internal/invokermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ invokerapi "oransc.org/nonrtric/
capifcor
e/internal/invokermanagementapi"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
"github.com/labstack/echo/v4"
)
"github.com/labstack/echo/v4"
)
diff --git
a/internal/invokermanagement/invokermanagement_test.go
b/capifcore/internal/invokermanagement/invokermanagement_test.go
similarity index 89%
rename from
internal/invokermanagement/invokermanagement_test.go
rename to
capifcore/internal/invokermanagement/invokermanagement_test.go
index
0b7b924
..
63f7509
100644
(file)
--- a/
internal/invokermanagement/invokermanagement_test.go
+++ b/
capifcore/internal/invokermanagement/invokermanagement_test.go
@@
-1,22
+1,22
@@
// -
// -
-// ========================LICENSE_START=================================
-// O-RAN-SC
-// %%
-// Copyright (C) 2022: Nordix Foundation
-// %%
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
//
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// ========================LICENSE_START=================================
+// O-RAN-SC
+// %%
+// Copyright (C) 2022: Nordix Foundation
+// %%
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
//
//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================LICENSE_END===================================
+// http://www.apache.org/licenses/LICENSE-2.0
//
//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ========================LICENSE_END===================================
package invokermanagement
import (
package invokermanagement
import (
@@
-25,15
+25,15
@@
import (
"os"
"testing"
"os"
"testing"
- "oransc.org/nonrtric/
sm
e/internal/invokermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/invokermanagementapi"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
- publishmocks "oransc.org/nonrtric/
sm
e/internal/publishservice/mocks"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
+ publishmocks "oransc.org/nonrtric/
capifcor
e/internal/publishservice/mocks"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
diff --git
a/internal/invokermanagement/mocks/InvokerRegister.go
b/capifcore/internal/invokermanagement/mocks/InvokerRegister.go
similarity index 100%
rename from
internal/invokermanagement/mocks/InvokerRegister.go
rename to
capifcore/internal/invokermanagement/mocks/InvokerRegister.go
diff --git
a/internal/invokermanagementapi/invokermanagementapi-server.gen.go
b/capifcore/internal/invokermanagementapi/invokermanagementapi-server.gen.go
similarity index 98%
rename from
internal/invokermanagementapi/invokermanagementapi-server.gen.go
rename to
capifcore/internal/invokermanagementapi/invokermanagementapi-server.gen.go
index
e7681dc
..
9ee06d2
100644
(file)
--- a/
internal/invokermanagementapi/invokermanagementapi-server.gen.go
+++ b/
capifcore/internal/invokermanagementapi/invokermanagementapi-server.gen.go
@@
-16,9
+16,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/invokermanagementapi/invokermanagementapi-types.gen.go
b/capifcore/internal/invokermanagementapi/invokermanagementapi-types.gen.go
similarity index 96%
rename from
internal/invokermanagementapi/invokermanagementapi-types.gen.go
rename to
capifcore/internal/invokermanagementapi/invokermanagementapi-types.gen.go
index
08c1080
..
4cb60e0
100644
(file)
--- a/
internal/invokermanagementapi/invokermanagementapi-types.gen.go
+++ b/
capifcore/internal/invokermanagementapi/invokermanagementapi-types.gen.go
@@
-4,9
+4,9
@@
package invokermanagementapi
import (
package invokermanagementapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// Information about the API Invoker that requested to onboard
)
// Information about the API Invoker that requested to onboard
diff --git
a/internal/loggingapi/loggingapi-server.gen.go
b/capifcore/internal/loggingapi/loggingapi-server.gen.go
similarity index 100%
rename from
internal/loggingapi/loggingapi-server.gen.go
rename to
capifcore/internal/loggingapi/loggingapi-server.gen.go
diff --git
a/internal/loggingapi/loggingapi-types.gen.go
b/capifcore/internal/loggingapi/loggingapi-types.gen.go
similarity index 95%
rename from
internal/loggingapi/loggingapi-types.gen.go
rename to
capifcore/internal/loggingapi/loggingapi-types.gen.go
index
947fc04
..
61a281f
100644
(file)
--- a/
internal/loggingapi/loggingapi-types.gen.go
+++ b/
capifcore/internal/loggingapi/loggingapi-types.gen.go
@@
-4,9
+4,9
@@
package loggingapi
import (
package loggingapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// Unsigned integer identifying a period of time in units of milliseconds.
)
// Unsigned integer identifying a period of time in units of milliseconds.
diff --git
a/internal/providermanagement/mocks/ServiceRegister.go
b/capifcore/internal/providermanagement/mocks/ServiceRegister.go
similarity index 100%
rename from
internal/providermanagement/mocks/ServiceRegister.go
rename to
capifcore/internal/providermanagement/mocks/ServiceRegister.go
diff --git
a/internal/providermanagement/providermanagement.go
b/capifcore/internal/providermanagement/providermanagement.go
similarity index 97%
rename from
internal/providermanagement/providermanagement.go
rename to
capifcore/internal/providermanagement/providermanagement.go
index
89430ee
..
82d833f
100644
(file)
--- a/
internal/providermanagement/providermanagement.go
+++ b/
capifcore/internal/providermanagement/providermanagement.go
@@
-28,8
+28,8
@@
import (
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- provapi "oransc.org/nonrtric/
sm
e/internal/providermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ provapi "oransc.org/nonrtric/
capifcor
e/internal/providermanagementapi"
log "github.com/sirupsen/logrus"
)
log "github.com/sirupsen/logrus"
)
diff --git
a/internal/providermanagement/providermanagement_test.go
b/capifcore/internal/providermanagement/providermanagement_test.go
similarity index 97%
rename from
internal/providermanagement/providermanagement_test.go
rename to
capifcore/internal/providermanagement/providermanagement_test.go
index
e88eeb9
..
06919e5
100644
(file)
--- a/
internal/providermanagement/providermanagement_test.go
+++ b/
capifcore/internal/providermanagement/providermanagement_test.go
@@
-28,8
+28,8
@@
import (
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- provapi "oransc.org/nonrtric/
sm
e/internal/providermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ provapi "oransc.org/nonrtric/
capifcor
e/internal/providermanagementapi"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
diff --git
a/internal/providermanagementapi/providermanagementapi-server.gen.go
b/capifcore/internal/providermanagementapi/providermanagementapi-server.gen.go
similarity index 98%
rename from
internal/providermanagementapi/providermanagementapi-server.gen.go
rename to
capifcore/internal/providermanagementapi/providermanagementapi-server.gen.go
index
98da71f
..
b38d99c
100644
(file)
--- a/
internal/providermanagementapi/providermanagementapi-server.gen.go
+++ b/
capifcore/internal/providermanagementapi/providermanagementapi-server.gen.go
@@
-16,8
+16,8
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/providermanagementapi/providermanagementapi-types.gen.go
b/capifcore/internal/providermanagementapi/providermanagementapi-types.gen.go
similarity index 98%
rename from
internal/providermanagementapi/providermanagementapi-types.gen.go
rename to
capifcore/internal/providermanagementapi/providermanagementapi-types.gen.go
index
0be47b3
..
7c2520e
100644
(file)
--- a/
internal/providermanagementapi/providermanagementapi-types.gen.go
+++ b/
capifcore/internal/providermanagementapi/providermanagementapi-types.gen.go
@@
-4,7
+4,7
@@
package providermanagementapi
import (
package providermanagementapi
import (
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Defines values for ApiProviderFuncRole.
)
// Defines values for ApiProviderFuncRole.
diff --git
a/internal/publishservice/mocks/APIRegister.go
b/capifcore/internal/publishservice/mocks/APIRegister.go
similarity index 95%
rename from
internal/publishservice/mocks/APIRegister.go
rename to
capifcore/internal/publishservice/mocks/APIRegister.go
index
3ec7699
..
860c125
100644
(file)
--- a/
internal/publishservice/mocks/APIRegister.go
+++ b/
capifcore/internal/publishservice/mocks/APIRegister.go
@@
-5,7
+5,7
@@
package mocks
import (
mock "github.com/stretchr/testify/mock"
import (
mock "github.com/stretchr/testify/mock"
- publishserviceapi "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ publishserviceapi "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// APIRegister is an autogenerated mock type for the APIRegister type
)
// APIRegister is an autogenerated mock type for the APIRegister type
diff --git
a/internal/publishservice/publishservice.go
b/capifcore/internal/publishservice/publishservice.go
similarity index 96%
rename from
internal/publishservice/publishservice.go
rename to
capifcore/internal/publishservice/publishservice.go
index
cdf11dd
..
51a0711
100644
(file)
--- a/
internal/publishservice/publishservice.go
+++ b/
capifcore/internal/publishservice/publishservice.go
@@
-28,11
+28,11
@@
import (
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/helmmanagement"
- "oransc.org/nonrtric/
sm
e/internal/providermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/helmmanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagement"
log "github.com/sirupsen/logrus"
)
log "github.com/sirupsen/logrus"
)
diff --git
a/internal/publishservice/publishservice_test.go
b/capifcore/internal/publishservice/publishservice_test.go
similarity index 93%
rename from
internal/publishservice/publishservice_test.go
rename to
capifcore/internal/publishservice/publishservice_test.go
index
b5f601d
..
9262b11
100644
(file)
--- a/
internal/publishservice/publishservice_test.go
+++ b/
capifcore/internal/publishservice/publishservice_test.go
@@
-26,15
+26,15
@@
import (
"os"
"testing"
"os"
"testing"
- "oransc.org/nonrtric/
sm
e/internal/providermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagement"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- publishapi "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ publishapi "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/helmmanagement"
- helmMocks "oransc.org/nonrtric/
sm
e/internal/helmmanagement/mocks"
- serviceMocks "oransc.org/nonrtric/
sm
e/internal/providermanagement/mocks"
+ "oransc.org/nonrtric/
capifcor
e/internal/helmmanagement"
+ helmMocks "oransc.org/nonrtric/
capifcor
e/internal/helmmanagement/mocks"
+ serviceMocks "oransc.org/nonrtric/
capifcor
e/internal/providermanagement/mocks"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
diff --git
a/internal/publishserviceapi/publishserviceapi-server.gen.go
b/capifcore/internal/publishserviceapi/publishserviceapi-server.gen.go
similarity index 98%
rename from
internal/publishserviceapi/publishserviceapi-server.gen.go
rename to
capifcore/internal/publishserviceapi/publishserviceapi-server.gen.go
index
6931cce
..
c5fea80
100644
(file)
--- a/
internal/publishserviceapi/publishserviceapi-server.gen.go
+++ b/
capifcore/internal/publishserviceapi/publishserviceapi-server.gen.go
@@
-16,9
+16,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/publishserviceapi/publishserviceapi-types.gen.go
b/capifcore/internal/publishserviceapi/publishserviceapi-types.gen.go
similarity index 98%
rename from
internal/publishserviceapi/publishserviceapi-types.gen.go
rename to
capifcore/internal/publishserviceapi/publishserviceapi-types.gen.go
index
fa04398
..
88e0199
100644
(file)
--- a/
internal/publishserviceapi/publishserviceapi-types.gen.go
+++ b/
capifcore/internal/publishserviceapi/publishserviceapi-types.gen.go
@@
-4,9
+4,9
@@
package publishserviceapi
import (
package publishserviceapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Defines values for CommunicationType.
)
// Defines values for CommunicationType.
diff --git
a/internal/routinginfoapi/routinginfoapi-server.gen.go
b/capifcore/internal/routinginfoapi/routinginfoapi-server.gen.go
similarity index 97%
rename from
internal/routinginfoapi/routinginfoapi-server.gen.go
rename to
capifcore/internal/routinginfoapi/routinginfoapi-server.gen.go
index
40a6ef9
..
8decc0b
100644
(file)
--- a/
internal/routinginfoapi/routinginfoapi-server.gen.go
+++ b/
capifcore/internal/routinginfoapi/routinginfoapi-server.gen.go
@@
-16,9
+16,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/routinginfoapi/routinginfoapi-types.gen.go
b/capifcore/internal/routinginfoapi/routinginfoapi-types.gen.go
similarity index 84%
rename from
internal/routinginfoapi/routinginfoapi-types.gen.go
rename to
capifcore/internal/routinginfoapi/routinginfoapi-types.gen.go
index
2e030e0
..
30cac8d
100644
(file)
--- a/
internal/routinginfoapi/routinginfoapi-types.gen.go
+++ b/
capifcore/internal/routinginfoapi/routinginfoapi-types.gen.go
@@
-4,10
+4,10
@@
package routinginfoapi
import (
package routinginfoapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef3 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef3 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// Represents IPv6 address range.
)
// Represents IPv6 address range.
diff --git
a/internal/security/security.go
b/capifcore/internal/security/security.go
similarity index 92%
rename from
internal/security/security.go
rename to
capifcore/internal/security/security.go
index
a5af126
..
25f9bbe
100644
(file)
--- a/
internal/security/security.go
+++ b/
capifcore/internal/security/security.go
@@
-26,12
+26,12
@@
import (
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
- securityapi "oransc.org/nonrtric/
sm
e/internal/securityapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ securityapi "oransc.org/nonrtric/
capifcor
e/internal/securityapi"
- "oransc.org/nonrtric/
sm
e/internal/invokermanagement"
- "oransc.org/nonrtric/
sm
e/internal/providermanagement"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/invokermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
)
type Security struct {
)
type Security struct {
diff --git
a/internal/security/security_test.go
b/capifcore/internal/security/security_test.go
similarity index 87%
rename from
internal/security/security_test.go
rename to
capifcore/internal/security/security_test.go
index
6eae671
..
e97e354
100644
(file)
--- a/
internal/security/security_test.go
+++ b/
capifcore/internal/security/security_test.go
@@
-27,19
+27,19
@@
import (
"os"
"testing"
"os"
"testing"
- "oransc.org/nonrtric/
sm
e/internal/securityapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/securityapi"
- "oransc.org/nonrtric/
sm
e/internal/invokermanagement"
- "oransc.org/nonrtric/
sm
e/internal/providermanagement"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/invokermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/common29122"
+ "oransc.org/nonrtric/
capifcor
e/internal/common29122"
- invokermocks "oransc.org/nonrtric/
sm
e/internal/invokermanagement/mocks"
- servicemocks "oransc.org/nonrtric/
sm
e/internal/providermanagement/mocks"
- publishmocks "oransc.org/nonrtric/
sm
e/internal/publishservice/mocks"
+ invokermocks "oransc.org/nonrtric/
capifcor
e/internal/invokermanagement/mocks"
+ servicemocks "oransc.org/nonrtric/
capifcor
e/internal/providermanagement/mocks"
+ publishmocks "oransc.org/nonrtric/
capifcor
e/internal/publishservice/mocks"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
"github.com/deepmap/oapi-codegen/pkg/middleware"
"github.com/deepmap/oapi-codegen/pkg/testutil"
diff --git
a/internal/securityapi/securityapi-server.gen.go
b/capifcore/internal/securityapi/securityapi-server.gen.go
similarity index 98%
rename from
internal/securityapi/securityapi-server.gen.go
rename to
capifcore/internal/securityapi/securityapi-server.gen.go
index
e805f78
..
3e67951
100644
(file)
--- a/
internal/securityapi/securityapi-server.gen.go
+++ b/
capifcore/internal/securityapi/securityapi-server.gen.go
@@
-16,9
+16,9
@@
import (
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
"github.com/deepmap/oapi-codegen/pkg/runtime"
"github.com/getkin/kin-openapi/openapi3"
"github.com/labstack/echo/v4"
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
- externalRef2 "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
+ externalRef2 "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
)
// ServerInterface represents all server handlers.
)
// ServerInterface represents all server handlers.
diff --git
a/internal/securityapi/securityapi-types.gen.go
b/capifcore/internal/securityapi/securityapi-types.gen.go
similarity index 98%
rename from
internal/securityapi/securityapi-types.gen.go
rename to
capifcore/internal/securityapi/securityapi-types.gen.go
index
a8db656
..
225168a
100644
(file)
--- a/
internal/securityapi/securityapi-types.gen.go
+++ b/
capifcore/internal/securityapi/securityapi-types.gen.go
@@
-4,8
+4,8
@@
package securityapi
import (
package securityapi
import (
- externalRef0 "oransc.org/nonrtric/
sm
e/internal/common29122"
- externalRef1 "oransc.org/nonrtric/
sm
e/internal/common29571"
+ externalRef0 "oransc.org/nonrtric/
capifcor
e/internal/common29122"
+ externalRef1 "oransc.org/nonrtric/
capifcor
e/internal/common29571"
)
// Defines values for AccessTokenErrError.
)
// Defines values for AccessTokenErrError.
diff --git
a/main.go
b/capifcore/main.go
similarity index 88%
rename from
main.go
rename to
capifcore/main.go
index
42ed985
..
3fffbce
100644
(file)
--- a/
main.go
+++ b/
capifcore/main.go
@@
-26,21
+26,21
@@
import (
"net/http"
"github.com/labstack/echo/v4"
"net/http"
"github.com/labstack/echo/v4"
- "oransc.org/nonrtric/
sm
e/internal/discoverserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/invokermanagementapi"
- "oransc.org/nonrtric/
sm
e/internal/providermanagementapi"
- "oransc.org/nonrtric/
sm
e/internal/securityapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/discoverserviceapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/invokermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagementapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/securityapi"
"github.com/deepmap/oapi-codegen/pkg/middleware"
echomiddleware "github.com/labstack/echo/v4/middleware"
log "github.com/sirupsen/logrus"
"github.com/deepmap/oapi-codegen/pkg/middleware"
echomiddleware "github.com/labstack/echo/v4/middleware"
log "github.com/sirupsen/logrus"
- "oransc.org/nonrtric/
sm
e/internal/discoverservice"
- "oransc.org/nonrtric/
sm
e/internal/helmmanagement"
- "oransc.org/nonrtric/
sm
e/internal/invokermanagement"
- "oransc.org/nonrtric/
sm
e/internal/providermanagement"
- "oransc.org/nonrtric/
sm
e/internal/publishservice"
- "oransc.org/nonrtric/
sm
e/internal/publishserviceapi"
- "oransc.org/nonrtric/
sm
e/internal/security"
+ "oransc.org/nonrtric/
capifcor
e/internal/discoverservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/helmmanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/invokermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/providermanagement"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishservice"
+ "oransc.org/nonrtric/
capifcor
e/internal/publishserviceapi"
+ "oransc.org/nonrtric/
capifcor
e/internal/security"
)
var url string
)
var url string
diff --git
a/main_test.go
b/capifcore/main_test.go
similarity index 100%
rename from
main_test.go
rename to
capifcore/main_test.go