Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(orc8r): Move cloud/go/obsidian to cloud/go/services #12742

Merged
merged 1 commit into from
Jun 27, 2022
Merged

refactor(orc8r): Move cloud/go/obsidian to cloud/go/services #12742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# GitHub-specific: https://github.com/github/linguist/blob/master/docs/overrides.md

# Monolithic swagger.yml is generated
/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml linguist-generated
/orc8r/cloud/go/services/obsidian/swagger/v1/swagger.yml linguist-generated
# NMS bindings are generated
/nms/generated/MagmaAPIBindings.js linguist-generated
# SBI openapi interface generated files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ jobs:
SWAGGERHUB_API_KEY: "${{ secrets.SWAGGERHUB_API_KEY }}"
run: |
swaggerhub api:unpublish MagmaCore/Magma/1.0.0
swaggerhub api:update MagmaCore/Magma/1.0.0 --file ${MAGMA_ROOT}/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml --published=publish --visibility=public --setdefault
swaggerhub api:update MagmaCore/Magma/1.0.0 --file ${MAGMA_ROOT}/orc8r/cloud/go/services/obsidian/swagger/v1/swagger.yml --published=publish --visibility=public --setdefault
- name: Extract commit title
id: commit
if: github.event_name == 'push'
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
**/go.sum @ghost
**/*.pb.go @ghost
**/*_swaggergen.go @ghost
/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml @ghost
/orc8r/cloud/go/services/obsidian/swagger/v1/swagger.yml @ghost
/orc8r/cloud/api/ @ghost
/nms/generated/MagmaAPIBindings.js @ghost
/nms/generated-ts/ @ghost
6 changes: 3 additions & 3 deletions cwf/cloud/go/services/cwf/cwf/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
cwf_analytics "magma/cwf/cloud/go/services/cwf/analytics"
"magma/cwf/cloud/go/services/cwf/obsidian/handlers"
builder_servicers "magma/cwf/cloud/go/services/cwf/servicers/protected"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/analytics"
"magma/orc8r/cloud/go/services/analytics/calculations"
"magma/orc8r/cloud/go/services/analytics/protos"
analytics_servicer "magma/orc8r/cloud/go/services/analytics/servicers/protected"
builder_protos "magma/orc8r/cloud/go/services/configurator/mconfig/protos"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
"magma/orc8r/lib/go/service/config"
)

Expand Down
2 changes: 1 addition & 1 deletion cwf/cloud/go/services/cwf/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
lteHandlers "magma/lte/cloud/go/services/lte/obsidian/handlers"
policyModels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/configurator"
directorydTypes "magma/orc8r/cloud/go/services/directoryd/types"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/handlers"
orc8rModels "magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/services/state"
Expand Down
4 changes: 2 additions & 2 deletions cwf/cloud/go/services/cwf/obsidian/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ import (
models3 "magma/feg/cloud/go/services/feg/obsidian/models"
"magma/orc8r/cloud/go/clock"
models5 "magma/orc8r/cloud/go/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/serde"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/configurator/test_init"
deviceTestInit "magma/orc8r/cloud/go/services/device/test_init"
directorydTypes "magma/orc8r/cloud/go/services/directoryd/types"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/services/state"
stateTestInit "magma/orc8r/cloud/go/services/state/test_init"
Expand Down
6 changes: 3 additions & 3 deletions dp/cloud/go/services/dp/dp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
dp_log "magma/dp/cloud/go/services/dp/obsidian/log"
"magma/dp/cloud/go/services/dp/servicers"
dp_storage "magma/dp/cloud/go/services/dp/storage"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/sqorc"
"magma/orc8r/cloud/go/storage"
"magma/orc8r/lib/go/service/config"
Expand Down
2 changes: 1 addition & 1 deletion dp/cloud/go/services/dp/obsidian/cbsd/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"magma/dp/cloud/go/protos"
dp_service "magma/dp/cloud/go/services/dp"
"magma/dp/cloud/go/services/dp/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/lib/go/merrors"
lib_protos "magma/orc8r/lib/go/protos"
"magma/orc8r/lib/go/registry"
Expand Down
4 changes: 2 additions & 2 deletions dp/cloud/go/services/dp/obsidian/cbsd/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"magma/dp/cloud/go/services/dp/obsidian/models"
"magma/dp/cloud/go/services/dp/obsidian/to_pointer"
"magma/dp/cloud/go/services/dp/storage/db"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/test_utils"
)

Expand Down
2 changes: 1 addition & 1 deletion dp/cloud/go/services/dp/obsidian/log/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (

"magma/dp/cloud/go/services/dp/obsidian/models"
"magma/dp/cloud/go/services/dp/obsidian/to_pointer"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/lib/go/service/config"
)

Expand Down
4 changes: 2 additions & 2 deletions dp/cloud/go/services/dp/obsidian/log/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"magma/dp/cloud/go/services/dp/obsidian/models"
"magma/dp/cloud/go/services/dp/obsidian/to_pointer"
"magma/dp/cloud/go/services/dp/storage/db"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/test_utils"
)

Expand Down
6 changes: 3 additions & 3 deletions feg/cloud/go/services/feg/feg/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
feg_service "magma/feg/cloud/go/services/feg"
"magma/feg/cloud/go/services/feg/obsidian/handlers"
builder_servicers "magma/feg/cloud/go/services/feg/servicers/protected"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
builder_protos "magma/orc8r/cloud/go/services/configurator/mconfig/protos"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion feg/cloud/go/services/feg/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"magma/feg/cloud/go/services/health"
lteHandlers "magma/lte/cloud/go/services/lte/obsidian/handlers"
policyModels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/handlers"
orc8rModels "magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/storage"
Expand Down
4 changes: 2 additions & 2 deletions feg/cloud/go/services/feg/obsidian/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
models3 "magma/lte/cloud/go/services/lte/obsidian/models"
policyModels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/clock"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/configurator"
configuratorTestInit "magma/orc8r/cloud/go/services/configurator/test_init"
deviceTestInit "magma/orc8r/cloud/go/services/device/test_init"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
stateTestInit "magma/orc8r/cloud/go/services/state/test_init"
"magma/orc8r/cloud/go/services/state/test_utils"
Expand Down
6 changes: 3 additions & 3 deletions lte/cloud/go/services/lte/lte/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import (
"magma/lte/cloud/go/services/lte/servicers"
protected_servicers "magma/lte/cloud/go/services/lte/servicers/protected"
lte_storage "magma/lte/cloud/go/services/lte/storage"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/analytics"
"magma/orc8r/cloud/go/services/analytics/calculations"
"magma/orc8r/cloud/go/services/analytics/protos"
analytics_servicer "magma/orc8r/cloud/go/services/analytics/servicers/protected"
builder_protos "magma/orc8r/cloud/go/services/configurator/mconfig/protos"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
state_protos "magma/orc8r/cloud/go/services/state/protos"
provider_protos "magma/orc8r/cloud/go/services/streamer/protos"
"magma/orc8r/cloud/go/sqorc"
Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/lte/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
lte_models "magma/lte/cloud/go/services/lte/obsidian/models"
policydb_models "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/handlers"
orc8r_models "magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/services/state"
Expand Down
4 changes: 2 additions & 2 deletions lte/cloud/go/services/lte/obsidian/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
policyModels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/clock"
models2 "magma/orc8r/cloud/go/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/serde"
"magma/orc8r/cloud/go/services/configurator"
configuratorTestInit "magma/orc8r/cloud/go/services/configurator/test_init"
"magma/orc8r/cloud/go/services/device"
deviceTestInit "magma/orc8r/cloud/go/services/device/test_init"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/services/state"
stateTestInit "magma/orc8r/cloud/go/services/state/test_init"
Expand Down
6 changes: 3 additions & 3 deletions lte/cloud/go/services/nprobe/nprobe/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"magma/lte/cloud/go/services/nprobe/obsidian/handlers"
np_storage "magma/lte/cloud/go/services/nprobe/storage"
"magma/orc8r/cloud/go/blobstore"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/swagger/protos"
servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/swagger/protos"
servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/sqorc"
"magma/orc8r/cloud/go/storage"
)
Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/nprobe/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"magma/lte/cloud/go/services/lte/obsidian/handlers"
"magma/lte/cloud/go/services/nprobe/obsidian/models"
"magma/lte/cloud/go/services/nprobe/storage"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/lib/go/merrors"
)

Expand Down
4 changes: 2 additions & 2 deletions lte/cloud/go/services/nprobe/obsidian/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"magma/lte/cloud/go/services/nprobe/obsidian/handlers"
"magma/lte/cloud/go/services/nprobe/obsidian/models"
"magma/lte/cloud/go/services/nprobe/storage"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/services/configurator"
configuratorTestInit "magma/orc8r/cloud/go/services/configurator/test_init"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/test_utils"
)

Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/policydb/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"magma/lte/cloud/go/serdes"
lte_handlers "magma/lte/cloud/go/services/lte/obsidian/handlers"
policydb_models "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/handlers"
)

Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/policydb/obsidian/handlers/policy_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"magma/lte/cloud/go/lte"
"magma/lte/cloud/go/serdes"
"magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/storage"
"magma/orc8r/lib/go/merrors"
)
Expand Down
4 changes: 2 additions & 2 deletions lte/cloud/go/services/policydb/obsidian/handlers/policy_handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"magma/lte/cloud/go/serdes"
"magma/lte/cloud/go/services/policydb/obsidian/handlers"
policyModels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/services/configurator"
configurator_test_init "magma/orc8r/cloud/go/services/configurator/test_init"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/storage"
)

Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/policydb/obsidian/handlers/rating_groups_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"magma/lte/cloud/go/lte"
"magma/lte/cloud/go/serdes"
"magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/lib/go/merrors"
)

Expand Down
4 changes: 2 additions & 2 deletions lte/cloud/go/services/policydb/obsidian/handlers/rating_groups_handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"magma/lte/cloud/go/serdes"
"magma/lte/cloud/go/services/policydb/obsidian/handlers"
"magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/configurator/test_init"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
)

// Basic API workflow tests
Expand Down
6 changes: 3 additions & 3 deletions lte/cloud/go/services/policydb/policydb/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"magma/lte/cloud/go/services/policydb"
"magma/lte/cloud/go/services/policydb/obsidian/handlers"
policydb_servicer "magma/lte/cloud/go/services/policydb/servicers/southbound"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swaggger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swaggger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/smsd/servicers/smsd_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
lteHandlers "magma/lte/cloud/go/services/lte/obsidian/handlers"
"magma/lte/cloud/go/services/smsd/obsidian/models"
"magma/lte/cloud/go/services/smsd/storage"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/services/obsidian"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions lte/cloud/go/services/smsd/smsd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
smsd_servicer "magma/lte/cloud/go/services/smsd/servicers/southbound"
storage2 "magma/lte/cloud/go/services/smsd/storage"
"magma/lte/cloud/go/sms_ll"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/sqorc"
"magma/orc8r/cloud/go/storage"
)
Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/subscriberdb/obsidian/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ import (
policydbmodels "magma/lte/cloud/go/services/policydb/obsidian/models"
"magma/lte/cloud/go/services/subscriberdb"
subscribermodels "magma/lte/cloud/go/services/subscriberdb/obsidian/models"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/serde"
"magma/orc8r/cloud/go/services/configurator"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/state"
state_types "magma/orc8r/cloud/go/services/state/types"
"magma/orc8r/cloud/go/storage"
Expand Down
4 changes: 2 additions & 2 deletions lte/cloud/go/services/subscriberdb/obsidian/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
subscriberModels "magma/lte/cloud/go/services/subscriberdb/obsidian/models"
subscriberdbTestInit "magma/lte/cloud/go/services/subscriberdb/test_init"
"magma/orc8r/cloud/go/clock"
"magma/orc8r/cloud/go/obsidian"
"magma/orc8r/cloud/go/obsidian/tests"
"magma/orc8r/cloud/go/orc8r"
"magma/orc8r/cloud/go/services/configurator"
configuratorTestInit "magma/orc8r/cloud/go/services/configurator/test_init"
testUtilConfigurator "magma/orc8r/cloud/go/services/configurator/test_utils"
deviceTestInit "magma/orc8r/cloud/go/services/device/test_init"
directorydTypes "magma/orc8r/cloud/go/services/directoryd/types"
"magma/orc8r/cloud/go/services/obsidian"
"magma/orc8r/cloud/go/services/obsidian/tests"
"magma/orc8r/cloud/go/services/orchestrator/obsidian/models"
"magma/orc8r/cloud/go/services/state"
stateTestInit "magma/orc8r/cloud/go/services/state/test_init"
Expand Down
2 changes: 1 addition & 1 deletion lte/cloud/go/services/subscriberdb/obsidian/models/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/thoas/go-funk"

"magma/orc8r/cloud/go/obsidian/models"
"magma/orc8r/cloud/go/services/obsidian/models"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions lte/cloud/go/services/subscriberdb/subscriberdb/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
subscriberdbcloud_servicer "magma/lte/cloud/go/services/subscriberdb/servicers/southbound"
subscriberdb_storage "magma/lte/cloud/go/services/subscriberdb/storage"
"magma/orc8r/cloud/go/blobstore"
"magma/orc8r/cloud/go/obsidian"
swagger_protos "magma/orc8r/cloud/go/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/obsidian/swagger/servicers/protected"
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/obsidian"
swagger_protos "magma/orc8r/cloud/go/services/obsidian/swagger/protos"
swagger_servicers "magma/orc8r/cloud/go/services/obsidian/swagger/servicers/protected"
state_protos "magma/orc8r/cloud/go/services/state/protos"
"magma/orc8r/cloud/go/sqorc"
"magma/orc8r/cloud/go/storage"
Expand Down