changed domain.public to domain.full_suffix, domain.internal to domain.internal_suffix

diff --git a/test/provider/common.json b/test/provider/common.json
index 35147ee1c0ab13b5633e6b93b5df52cb50250557..dc2b8276c548d45e09a71b9a66ee01c0819f1559 100644 (file)
--- a/test/provider/common.json
+++ b/test/provider/common.json
@@ -3,9 +3,11 @@
 #
 {
   "domain": {
-     "public": "rewire.co",
-     "internal": "rewire",
-     "name": "= node.name + '.' + (dns.public ? domain.public : domain.internal)"
+     "full_suffix": "rewire.co",
+     "internal_suffix": "rewire",
+     "full": "= node.name + '.' + domain.full_suffix",
+     "internal": "= node.name + '.' + domain.internal_suffix",
+     "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"
   },
   "dns": {
     "public": "= service_type != 'internal_service'"

diff --git a/test/provider/files/service-definitions/provider.json.erb b/test/provider/files/service-definitions/provider.json.erb
index e884524586cf646ca77077ed43536956d3582699..742b88f3c9efc58c99423f48ea742cad36cc52ea 100644 (file)
--- a/test/provider/files/service-definitions/provider.json.erb
+++ b/test/provider/files/service-definitions/provider.json.erb
@@ -5,7 +5,7 @@
   hsh = global.provider.pick(:languages, :description, :name, :enrollment_policy)
 
   # typically this is specified in common.json
-  hsh['domain'] = domain.public
+  hsh['domain'] = domain.full_suffix
 
   # advertise services that are 'user services'
   hsh['services'] = global.services[:service_type => :user_service].field(:name)

diff --git a/test/provider/services/webapp.json b/test/provider/services/webapp.json
index bfd701dcb25fd8f37acf64782f78eb8e89e56fb2..0e5b2f9d53d8927e5477ae44ee5d792ae7a018cd 100644 (file)
--- a/test/provider/services/webapp.json
+++ b/test/provider/services/webapp.json
@@ -8,8 +8,8 @@
     "eip_service": "file('service-definitions/eip-service.json.erb')"
   },
   "service_type": "public_service",
-  "api_domain": "= 'api.' + domain.public",
+  "api_domain": "= 'api.' + domain.full_suffix",
   "dns": {
-    "aliases": "= [domain.public, api_domain]"
+    "aliases": "= [domain.full, api_domain]"
   }
 }
\ No newline at end of file