add lazy evaluation to config specs

now callables are allowed in specs *only at one level depth*
to allow for last-minute evaluation on context-sensitive data,
like paths affected by os.environ

also some minor modifications to make check tests pass after
putting the new jsonconfig-based eipconfig in place.

aaaaaall green again :)

1 files changed, 1 insertions, 49 deletions

diff --git a/src/leap/eip/constants.py b/src/leap/eip/constants.py
index 31974926..ce50f5e0 100644
--- a/src/leap/eip/constants.py
+++ b/src/leap/eip/constants.py
@@ -1,51 +1,3 @@
+# not used anymore with the new JSONConfig.slug
 EIP_CONFIG = "eip.json"
-
-# XXX deprecate. EIPConfig used instead
-# can move for testing purposes.
-
-EIP_SAMPLE_JSON = {
-    "provider": "testprovider.example.org",
-    "transport": "openvpn",
-    "openvpn_protocol": "tcp",
-    "openvpn_port": "80",
-    "openvpn_ca_certificate": "~/.config/leap/providers/"
-                              "testprovider.example.org/"
-                              "keys/ca/testprovider-ca-cert-"
-                              "2013-01-01.pem",
-    "openvpn_client_certificate": "~/.config/leap/providers/"
-                                  "testprovider.example.org/"
-                                  "keys/client/openvpn-2012-09-31.pem",
-    "connect_on_login": True,
-    "block_cleartext_traffic": True,
-    "primary_gateway": "usa_west",
-    "secondary_gateway": "france",
-    "management_password": "oph7Que1othahwiech6J"
-}
-
 EIP_SERVICE_EXPECTED_PATH = "eip-service.json"
-
-EIP_SAMPLE_SERVICE = {
-    "serial": 1,
-    "version": "0.1.0",
-    "capabilities": {
-        "transport": ["openvpn"],
-        "ports": ["80", "53"],
-        "protocols": ["udp", "tcp"],
-        "static_ips": True,
-        "adblock": True
-    },
-    "gateways": [
-    {"country_code": "us",
-     "label": {"en":"west"},
-     "capabilities": {},
-     "hosts": ["1.2.3.4", "1.2.3.5"]},
-    {"country_code": "us",
-     "label": {"en":"east"},
-     "capabilities": {},
-     "hosts": ["1.2.3.4", "1.2.3.5"]},
-    {"country_code": "fr",
-     "label": {},
-     "capabilities": {},
-     "hosts": ["1.2.3.4", "1.2.3.5"]}
-    ]
-}