diff --git a/app/controllers/registrar/xml_consoles_controller.rb b/app/controllers/registrar/xml_consoles_controller.rb
index fd6804159..4c0a768c6 100644
--- a/app/controllers/registrar/xml_consoles_controller.rb
+++ b/app/controllers/registrar/xml_consoles_controller.rb
@@ -49,7 +49,7 @@ class Registrar
when 'contact-ee'
insert_prefix_and_version(xml, pref, '1.1')
else
- insert_prefix_and_version(xml, pref, '1.1')
+ insert_prefix_and_version(xml, pref, '1.2')
end
end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index ab4fdfadc..e9b5c3f74 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -225,7 +225,7 @@ class Domain < ApplicationRecord
end
def dnskey_update_enabled?
- statuses.include? DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+ statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
end
def admin_change_prohibited?
diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb
index ec157a60c..a53978836 100644
--- a/app/models/domain_status.rb
+++ b/app/models/domain_status.rb
@@ -10,7 +10,7 @@ class DomainStatus < ApplicationRecord
CLIENT_DELETE_PROHIBITED = 'clientDeleteProhibited'
SERVER_DELETE_PROHIBITED = 'serverDeleteProhibited'
SERVER_EXTENSION_UPDATE_PROHIBITED = 'serverExtensionUpdateProhibited'
- SERVER_DNSKEY_UPDATE_ENABLED = 'serverDnskeyUpdateEnabled'
+ SERVER_OBJ_UPDATE_PROHIBITED = 'serverObjUpdateProhibited'
# DNS delegation information MUST NOT be published for the object.
CLIENT_HOLD = 'clientHold'
@@ -87,7 +87,7 @@ class DomainStatus < ApplicationRecord
SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED,
SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE, DELETE_CANDIDATE, EXPIRED, DISPUTED,
SERVER_RELEASE_PROHIBITED, SERVER_EXTENSION_UPDATE_PROHIBITED,
- SERVER_DNSKEY_UPDATE_ENABLED
+ SERVER_OBJ_UPDATE_PROHIBITED
].freeze
CLIENT_STATUSES = [
@@ -99,7 +99,7 @@ class DomainStatus < ApplicationRecord
SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED,
SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, SERVER_RELEASE_PROHIBITED,
- SERVER_EXTENSION_UPDATE_PROHIBITED, SERVER_DNSKEY_UPDATE_ENABLED
+ SERVER_EXTENSION_UPDATE_PROHIBITED, SERVER_OBJ_UPDATE_PROHIBITED
].freeze
UPDATE_PROHIBIT_STATES = [
@@ -167,7 +167,7 @@ class DomainStatus < ApplicationRecord
['DeleteProhibited', SERVER_DELETE_PROHIBITED],
['ReleaseProhibited', SERVER_RELEASE_PROHIBITED],
['serverExtensionUpdateProhibited', SERVER_EXTENSION_UPDATE_PROHIBITED],
- ['serverDnskeyUpdateEnabled', SERVER_DNSKEY_UPDATE_ENABLED],
+ ['serverObjUpdateProhibited', SERVER_OBJ_UPDATE_PROHIBITED],
]
end
diff --git a/config/initializers/load_schemas.rb b/config/initializers/load_schemas.rb
index 1f34d58df..e07f08331 100644
--- a/config/initializers/load_schemas.rb
+++ b/config/initializers/load_schemas.rb
@@ -1 +1 @@
-EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read('lib/schemas/all-ee-1.2.xsd'))
+EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read('lib/schemas/all-ee-1.3.xsd'))
diff --git a/lib/schemas/all-ee-1.3.xsd b/lib/schemas/all-ee-1.3.xsd
new file mode 100644
index 000000000..305cce231
--- /dev/null
+++ b/lib/schemas/all-ee-1.3.xsd
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extensible Provisioning Protocol v1.0
+ all schema's grouped together
+
+
+
+
diff --git a/lib/schemas/domain-ee-1.2.xsd b/lib/schemas/domain-ee-1.2.xsd
index 073986ac7..0420dd134 100644
--- a/lib/schemas/domain-ee-1.2.xsd
+++ b/lib/schemas/domain-ee-1.2.xsd
@@ -1,7 +1,7 @@
-
+
+
diff --git a/test/integration/epp/domain/update/base_test.rb b/test/integration/epp/domain/update/base_test.rb
index 032754f6e..ab093d89f 100644
--- a/test/integration/epp/domain/update/base_test.rb
+++ b/test/integration/epp/domain/update/base_test.rb
@@ -50,7 +50,7 @@ class EppDomainUpdateBaseTest < EppTestCase
def test_update_domain_data_out_of_extension_block_with_serverDnskeyUpdateEnabled
@domain = domains(:shop)
- @domain.statuses << DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+ @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
@domain.save
@dnskey = dnskeys(:one)
@dnskey.update(domain: @domain)
@@ -95,7 +95,7 @@ class EppDomainUpdateBaseTest < EppTestCase
def test_update_domain_dns_with_serverDnskeyUpdateEnabled
@domain = domains(:shop)
- @domain.statuses << DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+ @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
@domain.save
@dnskey = dnskeys(:one)
@dnskey.update(domain: @domain)