From 33bf819afca84869c1bbe2e67757297178546f9c Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 17 May 2011 14:51:27 -0700
Subject: [PATCH] bug 9873: create default security group for the default admin
 status 9873: resolved fixed

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

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 16f3388c463..d11649661e3 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -25,8 +25,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -87,7 +85,6 @@ import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
-import com.cloud.utils.encoding.Base64.OutputStream;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.utils.script.Script;
@@ -360,6 +357,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) " +
+                "VALUES ('default', 'Default Security Group', 2, 1)";
+        
 
         txn = Transaction.currentTxn();
         try {
@@ -932,5 +942,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 d7f31a7df72..2ecfdad8404 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1300,6 +1300,7 @@ CREATE TABLE `cloud`.`security_group` (
   `description` varchar(4096) NULL,
   `domain_id` bigint unsigned NOT NULL,
   `account_id` bigint unsigned NOT NULL,
+  UNIQUE (`name`, `account_id`),
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;