sts-sponsors team mailing list archive

[Alberto Donato <mp+441697@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-site-manager:sampledata-drop-user-disabled into maas-site-manager:main.

Commit message:
drop disabled flag from sampledata



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~ack/maas-site-manager/+git/site-manager/+merge/441697
-- 
Your team MAAS Committers is requested to review the proposed merge of ~ack/maas-site-manager:sampledata-drop-user-disabled into maas-site-manager:main.

diff --git a/test-data/import.sh b/test-data/import.sh
index 0be384d..8adf22f 100755
--- a/test-data/import.sh
+++ b/test-data/import.sh
@@ -37,6 +37,6 @@ fi
 (
     copy_cmd sites.csv 'site(id, city, country, latitude, longitude, name, note, region, street, timezone, url)'
     copy_cmd tokens.csv 'token(site_id, value, expired, created)'
-    copy_cmd users.csv '"user"(email, full_name, disabled, password)'
+    copy_cmd users.csv '"user"(email, full_name, password)'
     copy_cmd site_data.csv 'site_data(site_id, allocated_machines, deployed_machines, ready_machines, error_machines, last_seen)'
 ) | psql "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
diff --git a/test-data/users.csv b/test-data/users.csv
index 4cc531b..c7cb8c3 100644
--- a/test-data/users.csv
+++ b/test-data/users.csv
@@ -1,3 +1,3 @@
-email, full_name, disabled, password (admin)
-admin@xxxxxxxxxxx,MAAS Admin,false,$2b$12$F5sgrhRNtWAOehcoVO.XK.oSvupmcg8.0T2jCHOTg15M8N8LrpRwS
-disabled@xxxxxxxxxxx,Obsolete Admin,true,$2b$12$iEPLFcNocyeUDgu2ywDVGeFHyrksI89bzSvdAwvU1N4zYFtofme3S
+email, full_name, password (admin)
+admin@xxxxxxxxxxx,MAAS Admin,$2b$12$F5sgrhRNtWAOehcoVO.XK.oSvupmcg8.0T2jCHOTg15M8N8LrpRwS
+admin2@xxxxxxxxxxx,Another MAAS Admin,$2b$12$iEPLFcNocyeUDgu2ywDVGeFHyrksI89bzSvdAwvU1N4zYFtofme3S