[roster-dns-management] r1151 committed - Resolving issue 375: Able to assign a dns_server to multiple dns_serve...

[roster-dns...@googlecode.com]

Revision: 1151
Author: J.S.P...@gmail.com
Date: Thu Jul 18 12:56:58 2013
Log: Resolving issue 375: Able to assign a dns_server to multiple
dns_server_sets
http://code.google.com/p/roster-dns-management/source/detail?r=1151

Modified:
/trunk/roster-core/roster_core/embedded_files.py
/trunk/roster-user-tools/scripts/dnsmkdnsserver
/trunk/test/core_regtest.py
/trunk/test/dnsmkdnsservers_test.py

=======================================
--- /trunk/roster-core/roster_core/embedded_files.py Sun Dec 23 19:12:56
2012
+++ /trunk/roster-core/roster_core/embedded_files.py Thu Jul 18 12:56:58
2013
@@ -470,13 +470,10 @@

CREATE TABLE `dns_server_set_assignments` (
`dns_server_set_assignments_id` smallint unsigned NOT NULL
auto_increment,
- `dns_server_set_assignments_dns_server_name` varchar(255) NOT NULL,
+ `dns_server_set_assignments_dns_server_name` varchar(255) UNIQUE NOT
NULL,
`dns_server_set_assignments_dns_server_set_name` varchar(255) NOT NULL,

PRIMARY KEY (`dns_server_set_assignments_id`),
- UNIQUE KEY `dns_server_set_assignments_unique_1`
- (`dns_server_set_assignments_dns_server_name`,
- `dns_server_set_assignments_dns_server_set_name`),

CONSTRAINT `dns_server_1` FOREIGN KEY
(`dns_server_set_assignments_dns_server_name`) REFERENCES `dns_servers`
=======================================
--- /trunk/roster-user-tools/scripts/dnsmkdnsserver Thu Aug 9 14:01:39 2012
+++ /trunk/roster-user-tools/scripts/dnsmkdnsserver Thu Jul 18 12:56:58 2013
@@ -112,6 +112,15 @@
cli_common_lib.DnsError(
'DNS Server Set "%s" does not exist.' % options.dns_server_set,
1)

+ dns_server_set_assignments = roster_client_lib.RunFunction(
+ u'ListDnsServerSetAssignments', options.username,
+ credfile=options.credfile, credstring=options.credstring,
+ server_name=options.server,
+ kwargs={'dns_server_name': options.dns_server})['core_return']
+ if( dns_server_set_assignments != {} ):
+ cli_common_lib.DnsError(
+ 'DNS Server "%s" is already assigned to DNS Server Set "%s"' % (
+ options.dns_server, dns_server_set_assignments.keys()[0]), 1)

roster_client_lib.RunFunction(
u'MakeDnsServerSetAssignments', options.username,
=======================================
--- /trunk/test/core_regtest.py Wed Jan 2 12:16:14 2013
+++ /trunk/test/core_regtest.py Thu Jul 18 12:56:58 2013
@@ -91,6 +91,19 @@
self.assertTrue(self.core_instance.RemoveUser(u'psmith'))
self.assertFalse(self.core_instance.ListUsers(user_name=u'psmith'))

+ def testMakeDuplicateDnsServerSetAssignmentError(self):
+ self.core_instance.MakeDnsServer(u'myserver_name', u'some_ssh_name',
+ u'/some_bind_dir/', u'/some_test_dir/')
+ self.core_instance.MakeDnsServerSet(u'some_set1')
+ self.core_instance.MakeDnsServerSet(u'some_set2')
+
+ self.core_instance.MakeDnsServerSetAssignments(u'myserver_name',
+ u'some_set1')
+ self.assertRaises(MySQLdb.IntegrityError,
+ self.core_instance.MakeDnsServerSetAssignments,
+ u'myserver_name',
+ u'some_set2')
+
def testCredentialMakeRemoveListUpdate(self):
current_time = datetime.datetime.now().replace(microsecond=0)

self.core_instance._MakeCredential(u'f47ac10b-58cc-4372-a567-0e02b2c3d479',
=======================================
--- /trunk/test/dnsmkdnsservers_test.py Thu Aug 9 14:01:39 2012
+++ /trunk/test/dnsmkdnsservers_test.py Thu Jul 18 12:56:58 2013
@@ -150,6 +150,7 @@
self.core_instance.MakeDnsServer(u'dns1', u'user',
u'/etc/bind/', u'/etc/bind/test/')
self.core_instance.MakeDnsServerSet(u'set1')
+ self.core_instance.MakeDnsServerSet(u'set2')
command = os.popen(
'python %s assignment -e set1 -d dns1 -u %s -p %s
--config-file %s '
'-s %s' % (
@@ -157,6 +158,14 @@
self.assertEqual(command.read(),
'ADDED DNS SERVER SET ASSIGNMENT: dns_server: dns1 '
'dns_server_set: set1\n')
+ command.close()
+ command = os.popen(
+ 'python %s assignment -e set2 -d dns1 -u %s -p %s
--config-file %s '
+ '-s %s' % (
+ EXEC, USERNAME, self.password, USER_CONFIG, self.server_name))
+ self.assertEqual(command.read(),
+ 'CLIENT ERROR: DNS Server "dns1" is already assigned to DNS Server
Set '
+ '"set1"\n')
command.close()
self.assertEqual(self.core_instance.ListDnsServerSetAssignments(),
{'set1': [u'dns1']})