From 629140af2db6cb9d614e38d7cb5d37f2b13d4c6a Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 17 May 2011 15:13:48 -0700
Subject: [PATCH] bug 9873: create default security group for the default admin
 status 9873: resolved fixed

Conflicts:

	setup/db/create-schema.sql
---
 .../com/cloud/server/ConfigurationServerImpl.java | 15 ++++++++++++++-
 setup/db/create-schema.sql                        |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 334e374aea7..da98df61b4e 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -367,6 +367,19 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         // now insert the user
         insertSql = "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, created) " +
                 "VALUES (" + id + ",'" + username + "','" + sb.toString() + "', 2, '" + firstname + "','" + lastname + "',now())";
+        
+
+        txn = Transaction.currentTxn();
+        try {
+            PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql);
+            stmt.executeUpdate();
+        } catch (SQLException ex) {
+        }
+        
+        //save default security group
+        insertSql = "INSERT INTO `cloud`.`security_group` (name, description, account_id, domain_id, account_name) " +
+                "VALUES ('default', 'Default Security Group', 2, 1, 'admin')";
+        
 
         txn = Transaction.currentTxn();
         try {
@@ -864,5 +877,5 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         }
         return networks.get(0).getId();
     }
-    
+
 }
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index aab024f00fb..275b2b5dcc8 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1282,6 +1282,7 @@ CREATE TABLE `cloud`.`security_group` (
   `domain_id` bigint unsigned NOT NULL,
   `account_id` bigint unsigned NOT NULL,
   `account_name` varchar(100) NOT NULL,
+  UNIQUE (`name`, `account_id`),
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;