fix tests

14 files changed, 149 insertions, 48 deletions

diff --git a/test/provider/Leapfile b/test/provider/Leapfile
index 5172af9..abab946 100644
--- a/test/provider/Leapfile
+++ b/test/provider/Leapfile
@@ -1 +1 @@
-@platform_directory = '../leap_platform'
\ No newline at end of file
+@platform_directory_path = '../../../leap_platform'
\ No newline at end of file
diff --git a/test/provider/files/cert/bitmask.net.crt b/test/provider/files/cert/bitmask.net.crt
new file mode 100644
index 0000000..f3aaae4
--- /dev/null
+++ b/test/provider/files/cert/bitmask.net.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICZzCCAdCgAwIBAgIRAPF3nvtTiGL4Z/z8rrJ2OKAwDQYJKoZIhvcNAQELBQAw
+SjEQMA4GA1UECgwHQml0bWFzazEcMBoGA1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5l
+dDEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMB4XDTE2MDQwOTAwMDAwMFoXDTE3
+MDQwOTAwMDAwMFowKDEQMA4GA1UECgwHQml0bWFzazEUMBIGA1UEAwwLYml0bWFz
+ay5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMcuc0zp/JMOkZZXmaH/
+/ABBtc3i79OD90LRk4AEXZ7X46Ougw92qeHvX8worEHgpiPxzlj2QETrH25ljuqK
+e/nDpHwO/43couFFliq3VnLLBDJvYzL5byTd5V0bs/q4tl5CUYt1j6Xg4ses/Hv3
+cHyNqNQKfVJuyeWdZhtNizhHAgMBAAGjbzBtMB0GA1UdDgQWBBTB0njg6dZRnf/Z
+dO7EBRUy2+fBpTALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwCQYD
+VR0TBAIwADAfBgNVHSMEGDAWgBQCuoulI/QMOR5z5nDOeXoOzkZtOjANBgkqhkiG
+9w0BAQsFAAOBgQAQ9EWhZJqLKLwCTOG0AD5+KwpbAkhHgdO3BXcMJAqLhjezmd9c
+cHQ/DZ/BSKmIm0eV6UsnxOBy9lZNIL1KqpazUyCgcCPDwDhd8Ihgk0x5ciNHgCFq
+6rCQ3kQVPVJZ2S2gQLOKJz1a0muMBE5KmIEL0ZMgqpn97YHgrOMCIjoM9g==
+-----END CERTIFICATE-----
diff --git a/test/provider/files/cert/bitmask.net.csr b/test/provider/files/cert/bitmask.net.csr
new file mode 100644
index 0000000..d106cb1
--- /dev/null
+++ b/test/provider/files/cert/bitmask.net.csr
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBpjCCAQ8CAQAwKDEQMA4GA1UECgwHQml0bWFzazEUMBIGA1UEAwwLYml0bWFz
+ay5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMcuc0zp/JMOkZZXmaH/
+/ABBtc3i79OD90LRk4AEXZ7X46Ougw92qeHvX8worEHgpiPxzlj2QETrH25ljuqK
+e/nDpHwO/43couFFliq3VnLLBDJvYzL5byTd5V0bs/q4tl5CUYt1j6Xg4ses/Hv3
+cHyNqNQKfVJuyeWdZhtNizhHAgMBAAGgPjA8BgkqhkiG9w0BCQ4xLzAtMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3
+DQEBCwUAA4GBAFnt0V7+qyPfQZQGF12DdCy0t3MRqFVQbcIegNPshKWP1GIruVMX
+ltJmTB1oVqVQ8Pmj0lIAbCrudHBqblnUUt1tME1JmWgH9wQtDaP5jnATJ1DQGMl1
+bQJQdiSE3/VGSeHn3K/XY7Yk2kmWZ3mzf1AwCmpwrn4SxIPiGcYa+21U
+-----END CERTIFICATE REQUEST-----
diff --git a/test/provider/files/cert/bitmask.net.key b/test/provider/files/cert/bitmask.net.key
new file mode 100644
index 0000000..877f781
--- /dev/null
+++ b/test/provider/files/cert/bitmask.net.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXwIBAAKBgQDHLnNM6fyTDpGWV5mh//wAQbXN4u/Tg/dC0ZOABF2e1+OjroMP
+dqnh71/MKKxB4KYj8c5Y9kBE6x9uZY7qinv5w6R8Dv+N3KLhRZYqt1ZyywQyb2My
++W8k3eVdG7P6uLZeQlGLdY+l4OLHrPx793B8jajUCn1SbsnlnWYbTYs4RwIDAQAB
+AoGBAKOKXh0+2aUdByi8EGbVOeI0EcRUmrm+1txEG6m26++qLzyL4wxlUCM0WiHV
+G2qTu5Yzykt9FVQBAbOxK2EkB5mezLxGhnR24bPcpvDAqWy/dKBQ5t4hARKdgw4A
+2iyhojno7aB/inP3ViTNvr/Kg77XyUgIq7fsLa8AsXJo0FAxAkEA5bye9XAYa29w
+uK64rrtaflWcUqeejl9BQtrAKQmlRHC3uKxmWv260fn2OZzYwsNdD96y8YKeFS6g
+65jj/eMPgwJBAN3znApBwUBDw4dX8ZLz2AC1P3ikQPGu+ySSf5+NJPUU3pgl6eL6
+pGaxplbDpFdvxgsfyxeSgNsFd/zmrD+v9O0CQQDjbTy3oIasJKAkU+NEJvjIxBuC
+v6j5LFdAxakhdwkCnctiqFiTj0cYgyk7k4gKFrjT8xSWfUXdllF7qdlaByPdAkEA
+t37+FKTERoM/lhepCxs6C2vNa8owPx+xVk0f4iLo2Q5F8Xf248bgQF7C7JyWtAse
+qnfAil5+1ZSx3I5A/e5VCQJBALWoaVH/laZinIWgka9TngD0BtLPvYjoH7iLSpAK
+STdh5IdwlcCKq/TzC+DpRYsEJM2wHEC+0nOLDp8xDwYPHfw=
+-----END RSA PRIVATE KEY-----
diff --git a/test/provider/files/cert/commercial_ca.crt b/test/provider/files/cert/commercial_ca.crt
new file mode 100644
index 0000000..468941e
--- /dev/null
+++ b/test/provider/files/cert/commercial_ca.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICbDCCAdWgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRAwDgYDVQQKDAdCaXRt
+YXNrMRwwGgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MRgwFgYDVQQDDA9CaXRt
+YXNrIFJvb3QgQ0EwIBcNMTYwNDA5MDAwMDAwWhgPMjExNjA0MDkwMDAwMDBaMEox
+EDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQx
+GDAWBgNVBAMMD0JpdG1hc2sgUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEArDu+1XWnEHS9CsemL6wuFZ09vY59SpXcpkMEOYLl+H5HibLsjt7PkDCi
+x4Bmf/0Mvlk5bft7VGHKtRbIe5/vIyA7IyIX76IHsX2iWASS4HaUE4ERtFTqE+2b
+x5N0/r5mYJCIhRslZdcAvzVb6NbujsQHU7NSRMOjBofVk1oYn+8CAwEAAaNgMF4w
+HQYDVR0OBBYEFAK6i6Uj9Aw5HnPmcM55eg7ORm06MA4GA1UdDwEB/wQEAwICBDAM
+BgNVHRMEBTADAQH/MB8GA1UdIwQYMBaAFAK6i6Uj9Aw5HnPmcM55eg7ORm06MA0G
+CSqGSIb3DQEBDQUAA4GBAD7cxb1nmhtfHfA4KnnK25dkHygMhqihj2xby3dLtAMO
+BuataWvN4ssgrUs7XdZRdagI2W2jA7RyLX8hFo+F2A0CRzYNwHl+Ffa2GuZko6M9
+4Muo4aEs7/h20jsxVFLezTGwN7lcyA8FoueGkCUXMm8WAAL0Id1hk+3ek70ywewh
+-----END CERTIFICATE-----
diff --git a/test/provider/files/service-definitions/provider.json.erb b/test/provider/files/service-definitions/provider.json.erb
deleted file mode 100644
index 96953c5..0000000
--- a/test/provider/files/service-definitions/provider.json.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%=
-  hsh = {}
-
-  # grab some fields from provider.json
-  hsh = global.provider.pick(:languages, :description, :name, :enrollment_policy)
-
-  # typically this is specified in common.json
-  hsh['domain'] = domain.full_suffix
-
-  # advertise services that are 'user services'
-  hsh['services'] = global.services[:service_type => :user_service].field(:name)
-
-  hsh['api_version'] = "1"
-  hsh['api_uri'] = "https://" + api_domain
-
-  #hsh['ca_cert_uri'] =
-  #hsh['ca_cert_fingerprint'] =
-
-  # {
-  #   "serial": 1,
-  #   "version": "0.1.0",
-  #   "domain": "springbok",
-  #   "languages": ["en"],
-  #   "display_name": {
-  #     "en": "Test Provider"
-  #   },
-  #   "description": {
-  #     "en": "This is a test provider"
-  #   },
-  #   "enrollment_policy": "open",
-  #   "services": ["eip"],
-  #   "api_version": "1.0.0",
-  #   "api_uri": "https://94.103.43.3",
-  #   "ca_cert_fingerprint": "SHA256 Fingerprint=19:F1:44:AA:57:DD:59:65:3B:07:5F:25:5D:02:D2:3F:FB:E6:A6:DA:FE:67:35:F2:7D:D7:8B:0E:BF:2B:E5:3C",
-  #   "ca_cert_uri": "https://springbok/ca.crt"
-  # }
-
-  JSON.sorted_generate hsh
-%>
\ No newline at end of file
diff --git a/test/provider/nodes/ns1.json b/test/provider/nodes/ns1.json
index c74bd40..8a9f0df 100644
--- a/test/provider/nodes/ns1.json
+++ b/test/provider/nodes/ns1.json
@@ -3,5 +3,6 @@
 //
 {
   "services": "dns",
-  "ip_address": "1.1.1.1"
+  "ip_address": "1.1.1.1",
+  "tags": "seattle"
 }
\ No newline at end of file
diff --git a/test/provider/nodes/ns2.json b/test/provider/nodes/ns2.json
index c051b95..b6d5dae 100644
--- a/test/provider/nodes/ns2.json
+++ b/test/provider/nodes/ns2.json
@@ -3,5 +3,6 @@
 //
 {
   "services": "dns",
-  "ip_address": "1.1.1.2"
+  "ip_address": "1.1.1.2",
+  "tags": "saopaulo"
 }
\ No newline at end of file
diff --git a/test/provider/nodes/pcouch1.json b/test/provider/nodes/pcouch1.json
index 35ea3aa..b0cf215 100644
--- a/test/provider/nodes/pcouch1.json
+++ b/test/provider/nodes/pcouch1.json
@@ -1,5 +1,5 @@
 {
-  "tags": "production",
+  "tags": ["production", "seattle"],
   "services": "couchdb",
   "ip_address": "11.0.0.2"
 }
diff --git a/test/provider/provider.json b/test/provider/provider.json
index 4fff3bf..d0f8abf 100644
--- a/test/provider/provider.json
+++ b/test/provider/provider.json
@@ -11,5 +11,21 @@
   },
   "languages": ["en"],
   "default_language": "en",
-  "enrollment_policy": "open"
-}
\ No newline at end of file
+  "enrollment_policy": "open",
+  "contacts": {
+    "default": "root@localhost"
+  },
+  "ca": {
+    "bit_size": 1024,
+    "client_certificates": {
+      "bit_size": 1024,
+      "life_span": "100 years"
+    },
+    "life_span": "100 years",
+    "server_certificates": {
+      "bit_size": 1024,
+      "digest": "SHA256",
+      "life_span": "100 years"
+    }
+  }
+}
diff --git a/test/provider/secrets.json b/test/provider/secrets.json
index fd7bd65..ffadc24 100644
--- a/test/provider/secrets.json
+++ b/test/provider/secrets.json
@@ -1,5 +1,54 @@
 {
-  "couch_admin_password": "Wf@W&@fQeK@qcItm-9fH~9ve8A4V5Dua",
-  "couch_ca_daemon_password": "jc7BQumjI7fs~naLrS_&%@bWImGz75+I",
-  "couch_webapp_password": "rXYr3RfJyqutsLZ6zQZ=&@WPXWnvdMpe"
+  "default": {
+    "api_monitor_auth_token": "UrmuBDZkA9XTsfaq4kpjbtshHY5daUxX",
+    "couch_admin_password": "TDMmtYBmm4r5dI4VXPXnxXsKkLfFPEPR",
+    "couch_admin_password_salt": "8b2db5d295e54bdef430aae96b955845",
+    "couch_leap_mx_password": "YXhAyvm57XgwhIZNYqxF3g8ykzhkg4SF",
+    "couch_leap_mx_password_salt": "ef432b612887112fd227de859ab78521",
+    "couch_nickserver_password": "sjNIQ98ymFwaAHyIX4XJKraNmwdHgBw9",
+    "couch_nickserver_password_salt": "7b932afd1c2ffc42763d340e4e8b2bcd",
+    "couch_replication_password": "UZne4MrH5HzNAamMeYReHjW7LJLabDZJ",
+    "couch_replication_password_salt": "341d5e378e3a1bffaa709dcca9bcd465",
+    "couch_soledad_password": "wVLLKJCLzmbkPNfzhLbPy3gjWhhBMRhF",
+    "couch_soledad_password_salt": "e40a4751078ffa0f364a77a486d0dc4c",
+    "couch_webapp_password": "LRQUHweyjIFnELw4sQT8pveEUqKhIxLU",
+    "couch_webapp_password_salt": "fbb4fa950d30e524b10775c6aa712564",
+    "nagios_test_password": "4XpCbaFbcAAcfPqAqMtXMdMpUWengLEk",
+    "webapp_secret_token": "BzWmcgK4Xf7xgmkdYHZK2qKBM2YT2ffM"
+  },
+  "local": {
+    "api_monitor_auth_token": "BUKNpTd9CPWcebeIXcSrmUmcXZZw3HEz",
+    "couch_admin_password": "mw2yxDQWw2HzTn5cIkBVnJhZJ5VXVEgZ",
+    "couch_admin_password_salt": "bbacf42821cee0af5a2fd638d014f939",
+    "couch_leap_mx_password": "Ray9PHuEUKscNQsIenpsfgbM2u2WBzPq",
+    "couch_leap_mx_password_salt": "d0dc07939c3f45a57954343f0e5fa13a",
+    "couch_nickserver_password": "pbXQcHXQ5cR9xwk9xsAwMCQ8mfLpvMmE",
+    "couch_nickserver_password_salt": "70cbc22a8603732bb6161f6e978d4abe",
+    "couch_replication_password": "aDgQI87unwHqkJWPxchayQpf7taUPTYe",
+    "couch_replication_password_salt": "6faaec5dc8c0ac5db9da91e01fc379a8",
+    "couch_soledad_password": "uEN8sfF3xXbhHg2WjpCVQyUy7LrkfTnA",
+    "couch_soledad_password_salt": "0db6d77f631df372bacc63dddea89e55",
+    "couch_webapp_password": "RT7D7KTjzuVdXXs5HDYTIMpdDFfJKeZu",
+    "couch_webapp_password_salt": "d8a7fb6c2f258137a4946ccb931d4e53",
+    "nagios_test_password": "FfbLyjPIQUBDvnHtVNCwHZsZ9UYfZdqa",
+    "scramblesuit_password_vpn1": "GJ2TSRLYKJLVAU2JKNNEIYSDKBKEGZ2R",
+    "scramblesuit_port_vpn1": 31531
+  },
+  "production": {
+    "api_monitor_auth_token": "TFkfYQHp5AMJmSY27YrPngg7sk5DtvBB",
+    "couch_admin_password": "Hqu7IhKmFHVpHU9pgTHffQYzh7ZWHc5B",
+    "couch_admin_password_salt": "8e7865b9e5263d06e1f74aea3dd44dd2",
+    "couch_leap_mx_password": "AMrrWcKnFbbhaBj4MxxgTFeHnNnHjQay",
+    "couch_leap_mx_password_salt": "2960d63958d067654be8c8d44131cd94",
+    "couch_nickserver_password": "WPUfpbEHu4d5FHTWgrefgrYHaKCsQKYX",
+    "couch_nickserver_password_salt": "983b745e70c31d811c876ca2c44d2ed0",
+    "couch_replication_password": "ImeBu2DIA3gRbrHcqHgzsFBYHkwbeJQS",
+    "couch_replication_password_salt": "54c09b42eb697972a4d7faabc9b4f2a6",
+    "couch_soledad_password": "fNbUdYdErwnfFCKZUHLBaLmYfnxIjEbW",
+    "couch_soledad_password_salt": "81cab24a5881de53ac79b4797b467d9f",
+    "couch_webapp_password": "8tFtJ84rYa59ECjrMbVUQVCjp4YhhK7F",
+    "couch_webapp_password_salt": "559eeeaa6ccd25169c9358c6c90eb24b",
+    "nagios_test_password": "8cuLRjYICKFPe4YaKwk22EytRsjQKP9X",
+    "webapp_secret_token": "4UQKXV94xqtFVkNSCqrphdNFJaPkQBx8"
+  }
 }
diff --git a/test/provider/tags/saopaulo.json b/test/provider/tags/saopaulo.json
new file mode 100644
index 0000000..ef1a4d5
--- /dev/null
+++ b/test/provider/tags/saopaulo.json
@@ -0,0 +1,8 @@
+{
+  "location": {
+    "name": "São Paulo",
+    "country_code": "BR",
+    "timezone":"-3",
+    "hemisphere": "S"
+  }
+}
diff --git a/test/provider/tags/seattle.json b/test/provider/tags/seattle.json
new file mode 100644
index 0000000..b992419
--- /dev/null
+++ b/test/provider/tags/seattle.json
@@ -0,0 +1,8 @@
+{
+  "location": {
+    "name": "Seattle, WA",
+    "country_code": "US",
+    "timezone":"-7",
+    "hemisphere": "N"
+  }
+}
diff --git a/test/provider/users/duck/duck_ssh.pub b/test/provider/users/duck/duck_ssh.pub
new file mode 100644
index 0000000..591f614
--- /dev/null
+++ b/test/provider/users/duck/duck_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDezTqhg/zFkGOQia0QRVRaDUmgdc73CEXadwVgYN41PITesjQinyT4hMOO8BJZVV70W1dWWCtT2j3JTFWLvhpgbjlYdiG676i9UpARvHTdt1FTAmlWfEfKvhDTqPByFyUooYfXBbpcZtqw+5ChP/lIjfWmfUVS3phTm5LzMetWTXY//dmuF+sHU9ZAWvrkYVI+IuJvb3mxv+CEbpS5s9yTS56qPP2czETbANoXsbBa29Ag+x22X/OiEUZ/mAfEuqBGh2uKH+9I/HhjorXSflYcwVhgA5P6QAhZEKU+B/PprIX/dF0HZLayJ6Y+0E7uUzNKxHupHmPI03VbxRO74K9t duck@home