CLOUDSTACK-6278

Frank.Zhang · Frank.Zhang · commit c301bd1c940f · 2014-09-05T16:28:33.000-07:00
Baremetal Advanced Networking support
diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
@@ -52,6 +52,10 @@ public Long getId() {
         return id;
     }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
@@ -26,5 +26,7 @@
  * Created by frank on 4/30/14.
  */
 public interface BaremetalVlanManager extends Manager, PluggableService {
+    public static final String BAREMETAL_SYSTEM_ACCOUNT_NAME = "baremetal-system-account";
+
     BaremetalRctResponse addRct(AddBaremetalRctCmd cmd);
 }
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -20,18 +20,26 @@
 import com.cloud.baremetal.database.BaremetalRctDao;
 import com.cloud.baremetal.database.BaremetalRctVO;
 import com.cloud.baremetal.networkservice.BaremetalRctResponse;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.user.dao.UserDao;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.google.gson.Gson;
 import org.apache.cloudstack.api.AddBaremetalRctCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Created by frank on 5/8/14.
@@ -41,6 +49,12 @@ public class BaremetalVlanManagerImpl extends ManagerBase implements BaremetalVl
 
     @Inject
     private BaremetalRctDao rctDao;
+    @Inject
+    private AccountDao acntDao;
+    @Inject
+    private UserDao userDao;
+    @Inject
+    private AccountManager acntMgr;
 
     @Override
     public BaremetalRctResponse addRct(AddBaremetalRctCmd cmd) {
@@ -78,6 +92,41 @@ public String getName() {
         return "Baremetal Vlan Manager";
     }
 
+    @Override
+    public boolean start() {
+        QueryBuilder<AccountVO> acntq = QueryBuilder.create(AccountVO.class);
+        acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, BaremetalVlanManager.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+        AccountVO acnt = acntq.find();
+        if (acnt != null) {
+            return true;
+        }
+
+        acnt = new AccountVO();
+        acnt.setAccountName(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+        acnt.setUuid(UUID.randomUUID().toString());
+        acnt.setState(Account.State.enabled);
+        acnt.setDomainId(1);
+        acnt = acntDao.persist(acnt);
+
+        UserVO user = new UserVO();
+        user.setState(Account.State.enabled);
+        user.setUuid(UUID.randomUUID().toString());
+        user.setAccountId(acnt.getAccountId());
+        user.setUsername(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+        user.setFirstname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+        user.setLastname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+        user.setPassword(UUID.randomUUID().toString());
+        user = userDao.persist(user);
+
+        RegisterCmd cmd = new RegisterCmd();
+        cmd.setId(user.getId());
+        String[] keys = acntMgr.createApiKeyAndSecretKey(cmd);
+        user.setApiKey(keys[0]);
+        user.setSecretKey(keys[1]);
+        userDao.update(user.getId(), user);
+        return true;
+    }
+
 
     @Override
     public List<Class<?>> getCommands() {

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@`
`26`	`26`	`* Created by frank on 4/30/14.`
`27`	`27`	`*/`
`28`	`28`	`public interface BaremetalVlanManager extends Manager, PluggableService {`
	`29`	`+ public static final String BAREMETAL_SYSTEM_ACCOUNT_NAME = "baremetal-system-account";`
	`30`	`+`
`29`	`31`	`BaremetalRctResponse addRct(AddBaremetalRctCmd cmd);`
`30`	`32`	`}`