added files to create demo collaboration #624

intGRen · 2023-04-13T14:52:56Z

Create demo collaboration that includes server configuration and server import as well as node configurations. These files will create N nodes for single server with a collaboration and organizations as well. Only one user is created.

@frankcorneliusmartin

frankcorneliusmartin

Still documentation needs to be added to /docs, here: https://docs.vantage6.ai/en/main/server/use.html#local-test-setup
Tests need to be added in https://github.com/vantage6/vantage6/tree/main/vantage6/tests_cli
Codacy complains about style issues: https://app.codacy.com/gh/vantage6/vantage6/pullRequest?prid=11555837

vantage6/vantage6/cli/node_config.j2

vantage6/vantage6/cli/server_config.j2

vantage6/vantage6/cli/server_import_config.j2

vantage6/vantage6/cli/setup.py

vantage6/vantage6/cli/template_generator.py

…tructuring

intGRen

Changes:

Removed setup.py
Renamed template_generator.py -> dummy_collaboration.py
Added trim_blocks and lstrp_blocks options to all the templates
Added ticks about argument names in docstrings

…6/vantage6/cli, added 'demo' folder to store the server-import YAML file created, saves node and server configurations in default paths i.e. AppData or ProgramData as well as few other fixes.

…`vdev create-collaboration`

docs/server/use.rst

vantage6/vantage6/cli/dummy_collaboration.py

frankcorneliusmartin · 2023-04-20T13:17:00Z

Also rename the function to vdev create-demo-network

intGRen · 2023-07-04T09:01:14Z

Org-id 0 -> start count at one in vdev create-demo-network

rename demo -> dev. Also for server/node folders

shell=True seems to be required on some systems but doesn't work on others. Need to figure out why

other nodes with part name demo_ or dev_ may be started/stopped/removed etc in the demo commands. Find a solution for this. Either clarify in docs, add warning to vnode new or find elegant solution so no naming conflicts may arise.

@bartvanb check latest push

bartvanb

We're getting there. Let's address the comments this afternoon

.gitignore

docs/server/use.rst

vantage6-common/vantage6/common/__init__.py

vantage6/vantage6/cli/dev.py

vantage6/vantage6/cli/node.py

vantage6/vantage6/cli/template/server_import_config.j2

bartvanb · 2023-07-31T12:37:50Z

Fix #625 - just linking this to the right issue

bartvanb

One further comment: the node dummy datasets are not removed yet

… conflicts

intGRen · 2023-08-01T11:47:41Z

@frankcorneliusmartin @bartvanb Codacy complains about things we cannot change at the moment...

…r fixes in server.py, node.py and utils.py

frankcorneliusmartin

Some final comments.

A few other notes, I find it acceptable to release it without these comments but lets create a separate issue for all of these.

when running vdev *-demo-network I get all server configurations. I would prefer to only have demo network configurations.
vdev remove-demo-network prompts

vantage6/vantage6/cli/dev.py

vantage6/vantage6/cli/server.py

vantage6/vantage6/cli/utils.py

vantage6/vantage6/cli/server.py

vantage6/vantage6/cli/node.py

…eate a config_folder under the node name until node has been run

added files to create demo collaboration

7b7230c

intGRen requested a review from frankcorneliusmartin April 13, 2023 14:54

intGRen assigned intGRen and frankcorneliusmartin Apr 13, 2023

intGRen mentioned this pull request Apr 13, 2023

[Feature Request] Create demo collaboration #625

Closed

frankcorneliusmartin requested changes Apr 17, 2023

View reviewed changes

fixed whitespace & indentation in .j2 files as well as minor code res…

fc5bf2c

…tructuring

intGRen commented Apr 17, 2023

View reviewed changes

intGRen added 2 commits April 17, 2023 14:55

moved j2 configuration files to template folder, refactored environment

be55e1a

updated demo_collaboration.py, now includes template dir in vantage…

8ab0bc2

…6/vantage6/cli, added 'demo' folder to store the server-import YAML file created, saves node and server configurations in default paths i.e. AppData or ProgramData as well as few other fixes.

intGRen requested a review from frankcorneliusmartin April 19, 2023 13:46

Added cli-group vdev and command create-collaboration to work as …

34fa692

…`vdev create-collaboration`

frankcorneliusmartin requested changes Apr 20, 2023

View reviewed changes

docs/server/use.rst Show resolved Hide resolved

vantage6/vantage6/cli/dummy_collaboration.py Outdated Show resolved Hide resolved

vantage6/vantage6/cli/dummy_collaboration.py Outdated Show resolved Hide resolved

vantage6/vantage6/cli/dummy_collaboration.py Outdated Show resolved Hide resolved

intGRen and others added 5 commits April 24, 2023 11:37

Added some info messages and updated some docstrings

c5b3153

Added logging and checks if configurations exists

8ce2217

Rearranged loop while requesting new node identifier

4592233

reconfigured file exists error, added some to-do's

f32d83e

Added start/stop functionality for demo-network

6803fd4

intGRen requested a review from frankcorneliusmartin May 11, 2023 15:04

intGRen added 2 commits May 12, 2023 13:31

updated way of finding Node configurations

96c0fdc

Added vdev remove-demo-network command

4dadd31

intGRen assigned bartvanb May 17, 2023

intGRen requested a review from bartvanb May 17, 2023 14:00

intGRen and others added 5 commits June 1, 2023 11:07

Updated remove-demo-network with new vserver_remove functionality

484c5ef

Renamed module

df88fea

Refactor I

59019ad

Fixed import error

39b04e8

Some modifications

4e5a043

bartvanb changed the base branch from release/3.9 to release/3.11 July 3, 2023 12:07

https://github.com/vantage6/vantage6/pull/624#issuecomment-1618128794

c95daf2

intGRen closed this Jul 4, 2023

intGRen reopened this Jul 4, 2023

bartvanb requested changes Jul 6, 2023

View reviewed changes

bartvanb added 3 commits July 6, 2023 16:19

Addressed review comments

a12496a

Cleaned up vserver commands

26f1485

Update help message for vdev start-demo-network

f9582ff

Updates to vdev commands

c32ea51

bartvanb reviewed Jul 31, 2023

View reviewed changes

bartvanb and others added 3 commits July 31, 2023 16:58

Merge release/3.11 into feature/create-demo-collaboration and resolve…

d719dc6

… conflicts

fixed some merge issues

a4469ba

Fixed some conflicts, handle dummy dataset deletion properly

13b2e27

intGRen added 3 commits August 1, 2023 14:18

Added testing documentation

3e5050a

Updated documentation

3737546

Updated vnode_remove function to remove log folder entirely, few mino…

b5e6ce7

…r fixes in server.py, node.py and utils.py

frankcorneliusmartin requested changes Aug 10, 2023

View reviewed changes

Minor typos, changed function name new_config_name to prompt_config_name

8bab1a9

intGRen requested a review from frankcorneliusmartin August 10, 2023 10:20

intGRen mentioned this pull request Aug 10, 2023

When running vdev *-demo-network it would be nice to see only the demo networks and not a list of a list of all the servers #786

Open

intGRen and others added 5 commits August 14, 2023 11:53

Updated tests, fixed vnode remove returning an error as it doesn't cr…

8d0f920

…eate a config_folder under the node name until node has been run

remove testing print statements

9eedc7e

changed elif to if, should do both checks regardless

d53509b

Fixed tests

64d24b8

Updated help text for vdev and renamed a function

05a523b

bartvanb approved these changes Aug 15, 2023

View reviewed changes

bartvanb merged commit 9924514 into release/3.11 Aug 15, 2023
2 of 3 checks passed

bartvanb deleted the feature/create-demo-collaboration branch August 15, 2023 12:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added files to create demo collaboration #624

added files to create demo collaboration #624

intGRen commented Apr 13, 2023

frankcorneliusmartin left a comment •

edited

intGRen left a comment

frankcorneliusmartin commented Apr 20, 2023

intGRen commented Jul 4, 2023 •

edited

bartvanb left a comment

bartvanb commented Jul 31, 2023

bartvanb left a comment

intGRen commented Aug 1, 2023

frankcorneliusmartin left a comment

added files to create demo collaboration #624

added files to create demo collaboration #624

Conversation

intGRen commented Apr 13, 2023

frankcorneliusmartin left a comment • edited

Choose a reason for hiding this comment

intGRen left a comment

Choose a reason for hiding this comment

frankcorneliusmartin commented Apr 20, 2023

intGRen commented Jul 4, 2023 • edited

bartvanb left a comment

Choose a reason for hiding this comment

bartvanb commented Jul 31, 2023

bartvanb left a comment

Choose a reason for hiding this comment

intGRen commented Aug 1, 2023

frankcorneliusmartin left a comment

Choose a reason for hiding this comment

frankcorneliusmartin left a comment •

edited

intGRen commented Jul 4, 2023 •

edited