fix(nms): improve sync of orc8r tenants with NMS organizations in NMS scripts #13939
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pull-request-size
bot
added
the
size/L
|
Thanks for opening a PR! 💯
Howto
More infoPlease take a moment to read through the Magma project's
If this is your first Magma PR, also consider reading
|
github-actions
bot
added
component: nms
alexzurbonsen
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
from
4141424
to
311a244
Compare
7 tasks
alexzurbonsen
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
2 times, most recently
from
20afbee
to
a1bcde2
Compare
sebathomas
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
from
a1bcde2
to
990d750
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
nms/scripts/createOrganization.ts
Outdated
| @@ -13,8 +13,13 @@ | |||
|
|
|||
| import Sequelize from 'sequelize'; | |||
|
|
|||
| import axios from 'axios'; | |||
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'axios' is defined but never used.
nms/scripts/setPassword.ts
Outdated
| @@ -12,11 +12,13 @@ | |||
| */ | |||
|
|
|||
| import Sequelize from 'sequelize'; | |||
| import axios from 'axios'; | |||
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'axios' is defined but never used.
Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
… if organization is created or updated Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
…ts with NMS orgs Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
Signed-off-by: Sebastian Thomas <sebastian.thomas@tngtech.com>
sebathomas
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
3 times, most recently
from
60212d2
to
f398fed
Compare
sebathomas
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
from
f398fed
to
31d2a64
Compare
nms/server/util/tenantsSync.ts
Outdated
|
|
||
| import OrchestratorAPI from '../api/OrchestratorAPI'; | ||
| import axios from 'axios'; | ||
| import {Organization} from '../../shared/sequelize_models'; |
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'Organization' is defined but never used.
nms/server/util/tenantsSync.ts
Outdated
| import axios from 'axios'; | ||
| import {Organization} from '../../shared/sequelize_models'; | ||
| import {OrganizationModel} from '../../shared/sequelize_models/models/organization'; | ||
| import {Tenant} from '../../generated'; |
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'Tenant' is defined but never used.
nms/server/util/tenantsSync.ts
Outdated
| import {Organization} from '../../shared/sequelize_models'; | ||
| import {OrganizationModel} from '../../shared/sequelize_models/models/organization'; | ||
| import {Tenant} from '../../generated'; | ||
| import {isEqual, sortBy} from 'lodash'; |
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'isEqual' is defined but never used.
nms/server/util/tenantsSync.ts
Outdated
| import {Organization} from '../../shared/sequelize_models'; | ||
| import {OrganizationModel} from '../../shared/sequelize_models/models/organization'; | ||
| import {Tenant} from '../../generated'; | ||
| import {isEqual, sortBy} from 'lodash'; |
There was a problem hiding this comment.
🚫 [eslint] <@typescript-eslint/no-unused-vars> reported by reviewdog 🐶
'sortBy' is defined but never used.
Signed-off-by: Sebastian Thomas <sebastian.thomas@tngtech.com>
sebathomas
force-pushed
the
nms-orc8r-tenants-sync-scripts
branch
from
31d2a64
to
39685cd
Compare
sebathomas
approved these changes
Sep 20, 2022
mpfirrmann
pushed a commit
to wolfseb/magma
that referenced
this pull request
Sep 21, 2022
… scripts (magma#13939) * refactor tenants sync functions in util file Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com> * adapt scripts that are run by dev_setup.sh to sync with orc8r as well if organization is created or updated Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com> * add modified version of syncTenants to utils, which syncs orc8r tenants with NMS orgs Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com> * add initial sync of orc8r tenants Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com> * Minor changes and fix mock server for e2e test Signed-off-by: Sebastian Thomas <sebastian.thomas@tngtech.com> * Revert initial tenants-sync when creating organization Signed-off-by: Sebastian Thomas <sebastian.thomas@tngtech.com> Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com> Signed-off-by: Sebastian Thomas <sebastian.thomas@tngtech.com> Co-authored-by: Sebastian Thomas <sebastian.thomas@tngtech.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
[merge after #13917 (and rebase before)]
This PR follows up on #13917 and implements corresponding changes in scripts that create or modify organizations.
These scripts are called when
dev_setup.shis run after NMS start up.In
createOrganization.tsan initial sync is introduced, which updates orc8r tenants to the state of NMS organizations.Test Plan
locally test that
dev_setup.sh(i.e. createOrganization.ts) is rundev_setup.share also created or updated in orc8r "tenants" tableAdditional Information