You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/09 14:26:47 UTC
[45/50] [abbrv] git commit: merge compiles
merge compiles
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14bd345f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14bd345f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/14bd345f
Branch: refs/heads/javelin
Commit: 14bd345f1f9fd4f78addf4714a7c6561c46f4be9
Parents: 7f3a748
Author: Alex Huang <al...@citrix.com>
Authored: Wed Jan 9 04:41:27 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Wed Jan 9 04:41:27 2013 -0800
----------------------------------------------------------------------
developer/pom.xml | 225 +-
engine/api/pom.xml | 5 +
.../engine/service/api/ProvisioningService.java | 4 -
.../engine/cloud/entity/api/db/VMEntityVO.java | 110 +-
.../engine/datacenter/entity/api/db/ClusterVO.java | 134 +-
.../datacenter/entity/api/db/DataCenterVO.java | 257 +-
.../engine/datacenter/entity/api/db/HostPodVO.java | 297 +-
.../engine/datacenter/entity/api/db/HostVO.java | 104 +-
.../storage/image/db/ImageDataDaoImpl.java | 33 +-
.../cloudstack/storage/image/db/ImageDataVO.java | 11 +-
.../cloudstack/storage/volume/db/VolumeVO.java | 11 +-
.../storage/datastore/db/PrimaryDataStoreVO.java | 22 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 25 +-
.../cloud/server/auth/LDAPUserAuthenticator.java | 58 +-
server/pom.xml | 5 +
server/src/com/cloud/api/ApiServer.java | 187 +-
.../cloud/network/StorageNetworkManagerImpl.java | 600 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 74 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 6 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 474 +-
.../com/cloud/server/ConfigurationServerImpl.java | 124 +-
.../src/com/cloud/server/ManagementServerImpl.java | 657 +-
.../src/com/cloud/servlet/CloudStartupServlet.java | 77 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 154 +-
server/src/com/cloud/user/AccountManagerImpl.java | 76 +-
server/src/com/cloud/user/DomainManagerImpl.java | 1 -
.../cloud/uuididentity/IdentityServiceImpl.java | 59 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 8613 ++++++++-------
setup/db/create-schema.sql | 1 +
utils/src/com/cloud/utils/StringUtils.java | 15 +-
30 files changed, 6246 insertions(+), 6173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 4ebb903..659c497 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -1,4 +1,4 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
you under the Apache License, Version 2.0 (the "License"); you may not use
@@ -431,21 +431,6 @@
</configuration>
</execution>
<execution>
- <id>grant-user-cloud-usage-all</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <username>root</username>
- <password>${db.root.password}</password>
- <url>jdbc:mysql://${db.cloud.host}:${db.cloud.port}</url>
- <sqlCommand>GRANT ALL ON cloud_usage.* to
- ${db.cloud.username}@`%` identified by
- '${db.cloud.password}';</sqlCommand>
- </configuration>
- </execution>
- <execution>
<id>grant-user-cloud-bridge</id>
<phase>process-test-resources</phase>
<goals>
@@ -507,9 +492,9 @@
</goals>
<configuration>
<autocommit>true</autocommit>
- <srcFiles>
- <srcFile>${basedir}/developer-prefill.sql</srcFile>
- </srcFiles>
+ <srcFiles>
+ <srcFile>${basedir}/developer-prefill.sql</srcFile>
+ </srcFiles>
</configuration>
</execution>
</executions>
@@ -518,56 +503,58 @@
</build>
</profile>
- <!-- Simulator profile -->
- <profile>
- <id>simulator</id>
- <activation>
- <property><name>deploydb-simulator</name></property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>${project.parent.basedir}/utils/conf/db.properties</file>
- <file>${project.parent.basedir}/utils/conf/db.properties.override</file>
- </files>
- <quiet>true</quiet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.5</version>
- <dependencies>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${cs.mysql.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <driver>org.gjt.mm.mysql.Driver</driver>
- <url>jdbc:mysql://${db.simulator.host}:3306/simulator</url>
- <username>${db.simulator.username}</username>
- <password>${db.simulator.password}</password>
- <skip>${maven.test.skip}</skip>
- <forceMojoExecution>true</forceMojoExecution>
- </configuration>
- <executions>
+ <!-- Simulator profile -->
+ <profile>
+ <id>simulator</id>
+ <activation>
+ <property>
+ <name>deploydb-simulator</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
<execution>
- <id>drop-database</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${project.parent.basedir}/utils/conf/db.properties</file>
+ <file>${project.parent.basedir}/utils/conf/db.properties.override</file>
+ </files>
+ <quiet>true</quiet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <driver>org.gjt.mm.mysql.Driver</driver>
+ <url>jdbc:mysql://${db.simulator.host}:3306/simulator</url>
+ <username>${db.simulator.username}</username>
+ <password>${db.simulator.password}</password>
+ <skip>${maven.test.skip}</skip>
+ <forceMojoExecution>true</forceMojoExecution>
+ </configuration>
+ <executions>
+ <execution>
+ <id>drop-database</id>
<phase>process-test-resources</phase>
<goals>
<goal>execute</goal>
@@ -575,12 +562,12 @@
<configuration>
<username>root</username>
<password>${db.root.password}</password>
- <url>jdbc:mysql://${db.simulator.host}:3306</url>
- <sqlCommand>drop database if exists `simulator`</sqlCommand>
- </configuration>
- </execution>
- <execution>
- <id>create-database</id>
+ <url>jdbc:mysql://${db.simulator.host}:3306</url>
+ <sqlCommand>drop database if exists `simulator`</sqlCommand>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create-database</id>
<phase>process-test-resources</phase>
<goals>
<goal>execute</goal>
@@ -588,51 +575,51 @@
<configuration>
<username>root</username>
<password>${db.root.password}</password>
- <url>jdbc:mysql://${db.simulator.host}:3306</url>
- <sqlCommand>create database `simulator`</sqlCommand>
- </configuration>
- </execution>
- <execution>
- <id>grant-user-cloud</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <username>root</username>
- <password>${db.root.password}</password>
- <url>jdbc:mysql://${db.simulator.host}:3306</url>
- <sqlCommand>GRANT ALL ON simulator.* to
- ${db.simulator.username}@`localhost` identified by
- '${db.simulator.password}';</sqlCommand>
- </configuration>
- </execution>
- <execution>
- <id>grant-user-cloud-all</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <username>root</username>
- <password>${db.root.password}</password>
- <url>jdbc:mysql://${db.simulator.host}:3306</url>
- <sqlCommand>GRANT ALL ON simulator.* to
- ${db.simulator.username}@`%` identified by
- '${db.simulator.password}';</sqlCommand>
- </configuration>
- </execution>
- <execution>
- <id>create-schema</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <srcFiles>
- <srcFile>${basedir}/target/db/create-schema-simulator.sql</srcFile>
- <srcFile>${basedir}/target/db/templates.simulator.sql</srcFile>
- </srcFiles>
+ <url>jdbc:mysql://${db.simulator.host}:3306</url>
+ <sqlCommand>create database `simulator`</sqlCommand>
+ </configuration>
+ </execution>
+ <execution>
+ <id>grant-user-cloud</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <username>root</username>
+ <password>${db.root.password}</password>
+ <url>jdbc:mysql://${db.simulator.host}:3306</url>
+ <sqlCommand>GRANT ALL ON simulator.* to
+ ${db.simulator.username}@`localhost` identified by
+ '${db.simulator.password}';</sqlCommand>
+ </configuration>
+ </execution>
+ <execution>
+ <id>grant-user-cloud-all</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <username>root</username>
+ <password>${db.root.password}</password>
+ <url>jdbc:mysql://${db.simulator.host}:3306</url>
+ <sqlCommand>GRANT ALL ON simulator.* to
+ ${db.simulator.username}@`%` identified by
+ '${db.simulator.password}';</sqlCommand>
+ </configuration>
+ </execution>
+ <execution>
+ <id>create-schema</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <srcFiles>
+ <srcFile>${basedir}/target/db/create-schema-simulator.sql</srcFile>
+ <srcFile>${basedir}/target/db/templates.simulator.sql</srcFile>
+ </srcFiles>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 63071b3..99c0151 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -22,6 +22,11 @@
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-api</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java
index 8648f56..e1ba1de 100755
--- a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java
@@ -21,8 +21,6 @@ package org.apache.cloudstack.engine.service.api;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.POST;
-
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity;
import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
@@ -42,10 +40,8 @@ public interface ProvisioningService {
StorageEntity registerStorage(String name, List<String> tags, Map<String, String> details);
- @POST
ZoneEntity registerZone(String zoneUuid, String name, String owner, List<String> tags, Map<String, String> details);
- @POST
PodEntity registerPod(String podUuid, String name, String owner, String zoneUuid, List<String> tags, Map<String, String> details);
ClusterEntity registerCluster(String clusterUuid, String name, String owner, List<String> tags, Map<String, String> details);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
index cebca33..93ac691 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
@@ -159,30 +159,30 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
@Column(name="uuid")
protected String uuid = UUID.randomUUID().toString();
-
+
//orchestration columns
@Column(name="owner")
private String owner = null;
-
+
@Column(name="speed")
private int speed;
-
+
@Transient
List<String> computeTags;
-
+
@Transient
List<String> rootDiskTags;
-
+
@Column(name="hostname")
private String hostname = null;
@Column(name="displayname")
private String displayname = null;
-
+
@Transient
List<String> networkIds;
-
-
+
+
public VMEntityVO(long id,
long serviceOfferingId,
String name,
@@ -227,8 +227,8 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
this(id, serviceOfferingId, name, instanceName, type, vmTemplateId, hypervisorType, guestOSId, domainId, accountId, haEnabled);
this.limitCpuUse = limitResourceUse;
}
-
-
+
+
protected VMEntityVO() {
}
@@ -501,60 +501,66 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject<State, Virt
this.serviceOfferingId = serviceOfferingId;
}
- public String getOwner() {
- return owner;
- }
+ public String getOwner() {
+ return owner;
+ }
- public void setOwner(String owner) {
- this.owner = owner;
- }
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
- public int getSpeed() {
- return speed;
- }
+ public int getSpeed() {
+ return speed;
+ }
- public void setSpeed(int speed) {
- this.speed = speed;
- }
+ public void setSpeed(int speed) {
+ this.speed = speed;
+ }
- public List<String> getComputeTags() {
- return computeTags;
- }
+ public List<String> getComputeTags() {
+ return computeTags;
+ }
- public void setComputeTags(List<String> computeTags) {
- this.computeTags = computeTags;
- }
+ public void setComputeTags(List<String> computeTags) {
+ this.computeTags = computeTags;
+ }
- public List<String> getRootDiskTags() {
- return rootDiskTags;
- }
+ public List<String> getRootDiskTags() {
+ return rootDiskTags;
+ }
- public void setRootDiskTags(List<String> rootDiskTags) {
- this.rootDiskTags = rootDiskTags;
- }
+ public void setRootDiskTags(List<String> rootDiskTags) {
+ this.rootDiskTags = rootDiskTags;
+ }
- public String getHostname() {
- return hostname;
- }
+ public String getHostname() {
+ return hostname;
+ }
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
+ public void setHostname(String hostname) {
+ this.hostname = hostname;
+ }
- public String getDisplayname() {
- return displayname;
- }
+ public String getDisplayname() {
+ return displayname;
+ }
- public void setDisplayname(String displayname) {
- this.displayname = displayname;
- }
+ public void setDisplayname(String displayname) {
+ this.displayname = displayname;
+ }
+
+ public List<String> getNetworkIds() {
+ return networkIds;
+ }
- public List<String> getNetworkIds() {
- return networkIds;
- }
+ public void setNetworkIds(List<String> networkIds) {
+ this.networkIds = networkIds;
+ }
- public void setNetworkIds(List<String> networkIds) {
- this.networkIds = networkIds;
- }
+ @Override
+ public long getDiskOfferingId() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterVO.java
index f13bde6..ab42323 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/ClusterVO.java
@@ -26,14 +26,14 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
-import com.cloud.api.Identity;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.org.Cluster;
-import com.cloud.org.Managed.ManagedState;
import com.cloud.org.Grouping;
+import com.cloud.org.Managed.ManagedState;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.StateMachine;
@@ -46,52 +46,52 @@ public class ClusterVO implements Cluster, Identity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
long id;
-
+
@Column(name="name")
String name;
-
+
@Column(name="guid")
String guid;
-
+
@Column(name="data_center_id")
long dataCenterId;
-
+
@Column(name="pod_id")
long podId;
-
+
@Column(name="hypervisor_type")
String hypervisorType;
@Column(name="cluster_type")
@Enumerated(value=EnumType.STRING)
Cluster.ClusterType clusterType;
-
+
@Column(name="allocation_state")
@Enumerated(value=EnumType.STRING)
AllocationState allocationState;
-
+
@Column(name="managed_state")
@Enumerated(value=EnumType.STRING)
ManagedState managedState;
-
+
@Column(name=GenericDao.REMOVED_COLUMN)
private Date removed;
@Column(name="uuid")
String uuid;
-
+
//orchestration
-
+
@Column(name="owner")
private String owner = null;
-
+
@Column(name=GenericDao.CREATED_COLUMN)
protected Date created;
@Column(name="lastUpdated", updatable=true)
@Temporal(value=TemporalType.TIMESTAMP)
protected Date lastUpdated;
-
+
/**
* Note that state is intentionally missing the setter. Any updates to
* the state machine needs to go through the DAO object because someone
@@ -101,59 +101,66 @@ public class ClusterVO implements Cluster, Identity {
@StateMachine(state=State.class, event=Event.class)
@Column(name="state", updatable=true, nullable=false, length=32)
protected State state = null;
-
-
+
+
public ClusterVO() {
- clusterType = Cluster.ClusterType.CloudManaged;
- allocationState = Grouping.AllocationState.Enabled;
-
- this.uuid = UUID.randomUUID().toString();
- this.state = State.Disabled;
+ clusterType = Cluster.ClusterType.CloudManaged;
+ allocationState = Grouping.AllocationState.Enabled;
+
+ this.uuid = UUID.randomUUID().toString();
+ this.state = State.Disabled;
}
-
+
public ClusterVO(long dataCenterId, long podId, String name) {
this.dataCenterId = dataCenterId;
this.podId = podId;
this.name = name;
- this.clusterType = Cluster.ClusterType.CloudManaged;
- this.allocationState = Grouping.AllocationState.Enabled;
- this.managedState = ManagedState.Managed;
- this.uuid = UUID.randomUUID().toString();
- this.state = State.Disabled;
+ this.clusterType = Cluster.ClusterType.CloudManaged;
+ this.allocationState = Grouping.AllocationState.Enabled;
+ this.managedState = ManagedState.Managed;
+ this.uuid = UUID.randomUUID().toString();
+ this.state = State.Disabled;
}
+ @Override
public long getId() {
return id;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public long getDataCenterId() {
return dataCenterId;
}
+ @Override
public long getPodId() {
return podId;
}
-
+
+ @Override
public Cluster.ClusterType getClusterType() {
- return clusterType;
+ return clusterType;
}
-
+
public void setClusterType(Cluster.ClusterType clusterType) {
- this.clusterType = clusterType;
+ this.clusterType = clusterType;
}
-
+
+ @Override
public AllocationState getAllocationState() {
- return allocationState;
+ return allocationState;
}
-
+
public void setAllocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
+ this.allocationState = allocationState;
}
-
+
+ @Override
public ManagedState getManagedState() {
return managedState;
}
@@ -170,7 +177,7 @@ public class ClusterVO implements Cluster, Identity {
public int hashCode() {
return NumbersUtil.hash(id);
}
-
+
@Override
public boolean equals(Object obj) {
if (!(obj instanceof ClusterVO)) {
@@ -179,19 +186,20 @@ public class ClusterVO implements Cluster, Identity {
ClusterVO that = (ClusterVO)obj;
return this.id == that.id;
}
-
+
+ @Override
public HypervisorType getHypervisorType() {
- return HypervisorType.getType(hypervisorType);
+ return HypervisorType.getType(hypervisorType);
}
- public void setHypervisorType(String hy) {
- hypervisorType = hy;
+ public void setHypervisorType(String hy) {
+ hypervisorType = hy;
}
-
+
public String getGuid() {
return guid;
}
-
+
public void setGuid(String guid) {
this.guid = guid;
}
@@ -203,33 +211,33 @@ public class ClusterVO implements Cluster, Identity {
public void setName(String name) {
this.name = name;
}
-
+
@Override
public String getUuid() {
- return this.uuid;
+ return this.uuid;
}
-
+
public void setUuid(String uuid) {
- this.uuid = uuid;
+ this.uuid = uuid;
}
-
- public String getOwner() {
- return owner;
- }
- public void setOwner(String owner) {
- this.owner = owner;
- }
+ public String getOwner() {
+ return owner;
+ }
- public Date getCreated() {
- return created;
- }
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
- public Date getLastUpdated() {
- return lastUpdated;
- }
+ public Date getCreated() {
+ return created;
+ }
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
- public State getState() {
- return state;
- }
+ public State getState() {
+ return state;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DataCenterVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DataCenterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DataCenterVO.java
index beccb6f..66fc67b 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DataCenterVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/DataCenterVO.java
@@ -29,10 +29,10 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
-import com.cloud.api.Identity;
import com.cloud.dc.DataCenter;
import com.cloud.network.Network.Provider;
import com.cloud.org.Grouping;
@@ -43,107 +43,107 @@ import com.cloud.utils.db.StateMachine;
@Entity
@Table(name="data_center")
public class DataCenterVO implements DataCenter, Identity {
-
+
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name="id")
private long id;
-
- @Column(name="name")
- private String name = null;
-
+
+ @Column(name="name")
+ private String name = null;
+
@Column(name="description")
private String description = null;
-
+
@Column(name="dns1")
private String dns1 = null;
-
+
@Column(name="dns2")
private String dns2 = null;
-
+
@Column(name="internal_dns1")
private String internalDns1 = null;
-
+
@Column(name="internal_dns2")
private String internalDns2 = null;
-
+
@Column(name="router_mac_address", updatable = false, nullable=false)
private String routerMacAddress = "02:00:00:00:00:01";
-
+
@Column(name="guest_network_cidr")
private String guestNetworkCidr = null;
-
+
@Column(name="domain_id")
private Long domainId = null;
@Column(name="domain")
private String domain;
-
+
@Column(name="networktype")
@Enumerated(EnumType.STRING)
NetworkType networkType;
-
+
@Column(name="dns_provider")
private String dnsProvider;
-
+
@Column(name="dhcp_provider")
private String dhcpProvider;
-
+
@Column(name="gateway_provider")
private String gatewayProvider;
-
+
@Column(name="vpn_provider")
private String vpnProvider;
-
+
@Column(name="userdata_provider")
private String userDataProvider;
-
+
@Column(name="lb_provider")
private String loadBalancerProvider;
-
+
@Column(name="firewall_provider")
private String firewallProvider;
-
+
@Column(name="mac_address", nullable=false)
@TableGenerator(name="mac_address_sq", table="data_center", pkColumnName="id", valueColumnName="mac_address", allocationSize=1)
private long macAddress = 1;
-
- @Column(name="zone_token")
- private String zoneToken;
-
+
+ @Column(name="zone_token")
+ private String zoneToken;
+
@Column(name=GenericDao.REMOVED_COLUMN)
private Date removed;
-
+
// This is a delayed load value. If the value is null,
// then this field has not been loaded yet.
// Call the dao to load it.
@Transient
Map<String, String> details;
-
+
@Column(name="allocation_state")
@Enumerated(value=EnumType.STRING)
AllocationState allocationState;
- @Column(name="uuid")
- private String uuid;
-
+ @Column(name="uuid")
+ private String uuid;
+
@Column(name="is_security_group_enabled")
boolean securityGroupEnabled;
-
+
@Column(name="is_local_storage_enabled")
boolean localStorageEnabled;
-
+
//orchestration
@Column(name="owner")
private String owner = null;
-
+
@Column(name=GenericDao.CREATED_COLUMN)
protected Date created;
@Column(name="lastUpdated", updatable=true)
@Temporal(value=TemporalType.TIMESTAMP)
protected Date lastUpdated;
-
+
/**
* Note that state is intentionally missing the setter. Any updates to
* the state machine needs to go through the DAO object because someone
@@ -199,13 +199,13 @@ public class DataCenterVO implements DataCenter, Identity {
public void setFirewallProvider(String firewallProvider) {
this.firewallProvider = firewallProvider;
}
-
+
public DataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) {
this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false, false);
this.id = id;
this.allocationState = Grouping.AllocationState.Enabled;
this.uuid = UUID.randomUUID().toString();
- }
+ }
public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled) {
this.name = name;
@@ -221,7 +221,7 @@ public class DataCenterVO implements DataCenter, Identity {
this.allocationState = Grouping.AllocationState.Enabled;
this.securityGroupEnabled = securityGroupEnabled;
this.localStorageEnabled = localStorageEnabled;
-
+
if (zoneType == NetworkType.Advanced) {
loadBalancerProvider = Provider.VirtualRouter.getName();
firewallProvider = Provider.VirtualRouter.getName();
@@ -242,7 +242,7 @@ public class DataCenterVO implements DataCenter, Identity {
this.uuid = UUID.randomUUID().toString();
this.state = State.Disabled;
}
-
+
@Override
public String getVpnProvider() {
return vpnProvider;
@@ -260,27 +260,27 @@ public class DataCenterVO implements DataCenter, Identity {
public void setUserDataProvider(String userDataProvider) {
this.userDataProvider = userDataProvider;
}
-
+
@Override
public String getGuestNetworkCidr()
{
- return guestNetworkCidr;
+ return guestNetworkCidr;
}
-
+
public void setGuestNetworkCidr(String guestNetworkCidr)
{
- this.guestNetworkCidr = guestNetworkCidr;
+ this.guestNetworkCidr = guestNetworkCidr;
}
@Override
public Long getDomainId() {
- return domainId;
- }
+ return domainId;
+ }
- public void setDomainId(Long domainId) {
- this.domainId = domainId;
- }
-
+ public void setDomainId(Long domainId) {
+ this.domainId = domainId;
+ }
+
@Override
public String getDescription() {
return description;
@@ -289,12 +289,12 @@ public class DataCenterVO implements DataCenter, Identity {
public String getRouterMacAddress() {
return routerMacAddress;
}
-
+
@Override
public String getDns1() {
return dns1;
}
-
+
@Override
public String getDns2() {
return dns2;
@@ -310,43 +310,43 @@ public class DataCenterVO implements DataCenter, Identity {
return internalDns2;
}
- protected DataCenterVO() {
+ protected DataCenterVO() {
}
- @Override
+ @Override
public long getId() {
- return id;
- }
-
- @Override
+ return id;
+ }
+
+ @Override
public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setDns1(String dns1) {
- this.dns1 = dns1;
- }
-
- public void setDns2(String dns2) {
- this.dns2 = dns2;
- }
-
- public void setInternalDns1(String dns3) {
- this.internalDns1 = dns3;
- }
-
- public void setInternalDns2(String dns4) {
- this.internalDns2 = dns4;
- }
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setDns1(String dns1) {
+ this.dns1 = dns1;
+ }
+
+ public void setDns2(String dns2) {
+ this.dns2 = dns2;
+ }
+
+ public void setInternalDns1(String dns3) {
+ this.internalDns1 = dns3;
+ }
+
+ public void setInternalDns2(String dns4) {
+ this.internalDns2 = dns4;
+ }
public void setRouterMacAddress(String routerMacAddress) {
this.routerMacAddress = routerMacAddress;
}
-
+
@Override
public String getDomain() {
return domain;
@@ -355,7 +355,7 @@ public class DataCenterVO implements DataCenter, Identity {
public void setDomain(String domain) {
this.domain = domain;
}
-
+
public void setNetworkType(NetworkType zoneNetworkType) {
this.networkType = zoneNetworkType;
}
@@ -364,16 +364,16 @@ public class DataCenterVO implements DataCenter, Identity {
public NetworkType getNetworkType() {
return networkType;
}
-
+
@Override
public boolean isSecurityGroupEnabled() {
return securityGroupEnabled;
}
-
+
public void setSecurityGroupEnabled(boolean enabled) {
this.securityGroupEnabled = enabled;
}
-
+
@Override
public boolean isLocalStorageEnabled() {
return localStorageEnabled;
@@ -392,32 +392,33 @@ public class DataCenterVO implements DataCenter, Identity {
public void setDetails(Map<String, String> details2) {
details = details2;
}
-
+
public String getDetail(String name) {
assert (details != null) : "Did you forget to load the details?";
-
+
return details != null ? details.get(name) : null;
}
-
+
public void setDetail(String name, String value) {
assert (details != null) : "Did you forget to load the details?";
-
+
details.put(name, value);
}
-
+
+ @Override
public AllocationState getAllocationState() {
- return allocationState;
+ return allocationState;
}
-
+
public void setAllocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
+ this.allocationState = allocationState;
}
-
+
@Override
public int hashCode() {
return NumbersUtil.hash(id);
}
-
+
@Override
public boolean equals(Object obj) {
if (!(obj instanceof DataCenterVO)) {
@@ -429,25 +430,25 @@ public class DataCenterVO implements DataCenter, Identity {
@Override
public String getZoneToken() {
- return zoneToken;
- }
-
- public void setZoneToken(String zoneToken) {
- this.zoneToken = zoneToken;
- }
-
- public Date getRemoved() {
- return removed;
- }
-
- @Override
- public String getUuid() {
- return this.uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
+ return zoneToken;
+ }
+
+ public void setZoneToken(String zoneToken) {
+ this.zoneToken = zoneToken;
+ }
+
+ public Date getRemoved() {
+ return removed;
+ }
+
+ @Override
+ public String getUuid() {
+ return this.uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
public long getMacAddress() {
return macAddress;
@@ -457,23 +458,23 @@ public class DataCenterVO implements DataCenter, Identity {
this.macAddress = macAddress;
}
- public String getOwner() {
- return owner;
- }
+ public String getOwner() {
+ return owner;
+ }
- public void setOwner(String owner) {
- this.owner = owner;
- }
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
- public Date getCreated() {
- return created;
- }
+ public Date getCreated() {
+ return created;
+ }
- public Date getLastUpdated() {
- return lastUpdated;
- }
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
- public State getState() {
- return state;
- }
+ public State getState() {
+ return state;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostPodVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostPodVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostPodVO.java
index 6467a4b..6c71136 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostPodVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostPodVO.java
@@ -26,10 +26,10 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
-import com.cloud.api.Identity;
import com.cloud.dc.Pod;
import com.cloud.org.Grouping;
import com.cloud.utils.NumbersUtil;
@@ -39,52 +39,52 @@ import com.cloud.utils.db.StateMachine;
@Entity
@Table(name = "host_pod_ref")
public class HostPodVO implements Pod, Identity {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- long id;
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ long id;
- @Column(name = "name")
- private String name = null;
+ @Column(name = "name")
+ private String name = null;
- @Column(name = "data_center_id")
- private long dataCenterId;
-
- @Column(name = "gateway")
- private String gateway;
+ @Column(name = "data_center_id")
+ private long dataCenterId;
+
+ @Column(name = "gateway")
+ private String gateway;
- @Column(name = "cidr_address")
- private String cidrAddress;
+ @Column(name = "cidr_address")
+ private String cidrAddress;
- @Column(name = "cidr_size")
- private int cidrSize;
+ @Column(name = "cidr_size")
+ private int cidrSize;
- @Column(name = "description")
- private String description;
-
+ @Column(name = "description")
+ private String description;
+
@Column(name="allocation_state")
@Enumerated(value=EnumType.STRING)
AllocationState allocationState;
- @Column(name = "external_dhcp")
- private Boolean externalDhcp;
-
+ @Column(name = "external_dhcp")
+ private Boolean externalDhcp;
+
@Column(name=GenericDao.REMOVED_COLUMN)
private Date removed;
- @Column(name = "uuid")
- private String uuid;
-
+ @Column(name = "uuid")
+ private String uuid;
+
//orchestration
@Column(name="owner")
private String owner = null;
-
+
@Column(name=GenericDao.CREATED_COLUMN)
protected Date created;
@Column(name="lastUpdated", updatable=true)
@Temporal(value=TemporalType.TIMESTAMP)
protected Date lastUpdated;
-
+
/**
* Note that state is intentionally missing the setter. Any updates to
* the state machine needs to go through the DAO object because someone
@@ -95,147 +95,152 @@ public class HostPodVO implements Pod, Identity {
@Column(name="state", updatable=true, nullable=false, length=32)
protected State state = null;
- public HostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description) {
- this.name = name;
- this.dataCenterId = dcId;
- this.gateway = gateway;
- this.cidrAddress = cidrAddress;
- this.cidrSize = cidrSize;
- this.description = description;
- this.allocationState = Grouping.AllocationState.Enabled;
- this.externalDhcp = false;
- this.uuid = UUID.randomUUID().toString();
- this.state = State.Disabled;
- }
-
- /*
- * public HostPodVO(String name, long dcId) { this(null, name, dcId); }
- */
- protected HostPodVO() {
- this.uuid = UUID.randomUUID().toString();
- }
-
- @Override
+ public HostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description) {
+ this.name = name;
+ this.dataCenterId = dcId;
+ this.gateway = gateway;
+ this.cidrAddress = cidrAddress;
+ this.cidrSize = cidrSize;
+ this.description = description;
+ this.allocationState = Grouping.AllocationState.Enabled;
+ this.externalDhcp = false;
+ this.uuid = UUID.randomUUID().toString();
+ this.state = State.Disabled;
+ }
+
+ /*
+ * public HostPodVO(String name, long dcId) { this(null, name, dcId); }
+ */
+ protected HostPodVO() {
+ this.uuid = UUID.randomUUID().toString();
+ }
+
+ @Override
public long getId() {
- return id;
- }
+ return id;
+ }
- public long getDataCenterId() {
- return dataCenterId;
- }
+ @Override
+ public long getDataCenterId() {
+ return dataCenterId;
+ }
- public void setDataCenterId(long dataCenterId) {
- this.dataCenterId = dataCenterId;
- }
+ public void setDataCenterId(long dataCenterId) {
+ this.dataCenterId = dataCenterId;
+ }
- public String getName() {
- return name;
- }
+ @Override
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
+ @Override
public String getCidrAddress() {
- return cidrAddress;
- }
+ return cidrAddress;
+ }
- public void setCidrAddress(String cidrAddress) {
- this.cidrAddress = cidrAddress;
- }
+ public void setCidrAddress(String cidrAddress) {
+ this.cidrAddress = cidrAddress;
+ }
- @Override
+ @Override
public int getCidrSize() {
- return cidrSize;
- }
-
- public void setCidrSize(int cidrSize) {
- this.cidrSize = cidrSize;
- }
-
- @Override
+ return cidrSize;
+ }
+
+ public void setCidrSize(int cidrSize) {
+ this.cidrSize = cidrSize;
+ }
+
+ @Override
public String getGateway() {
- return gateway;
- }
-
- public void setGateway(String gateway) {
- this.gateway = gateway;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
+ return gateway;
+ }
+
+ public void setGateway(String gateway) {
+ this.gateway = gateway;
+ }
+
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @Override
public AllocationState getAllocationState() {
- return allocationState;
+ return allocationState;
}
-
+
public void setAllocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
- }
-
- // Use for comparisons only.
- public HostPodVO(Long id) {
- this.id = id;
- }
-
- @Override
+ this.allocationState = allocationState;
+ }
+
+ // Use for comparisons only.
+ public HostPodVO(Long id) {
+ this.id = id;
+ }
+
+ @Override
public int hashCode() {
- return NumbersUtil.hash(id);
- }
-
- public boolean getExternalDhcp() {
- return externalDhcp;
- }
-
- public void setExternalDhcp(boolean use) {
- externalDhcp = use;
- }
-
- @Override
+ return NumbersUtil.hash(id);
+ }
+
+ @Override
+ public boolean getExternalDhcp() {
+ return externalDhcp;
+ }
+
+ public void setExternalDhcp(boolean use) {
+ externalDhcp = use;
+ }
+
+ @Override
public boolean equals(Object obj) {
- if (obj instanceof HostPodVO) {
- return id == ((HostPodVO)obj).id;
- } else {
- return false;
- }
- }
-
+ if (obj instanceof HostPodVO) {
+ return id == ((HostPodVO)obj).id;
+ } else {
+ return false;
+ }
+ }
+
public Date getRemoved() {
return removed;
}
-
+
@Override
public String getUuid() {
- return this.uuid;
+ return this.uuid;
}
-
+
public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- public Date getCreated() {
- return created;
- }
-
- public Date getLastUpdated() {
- return lastUpdated;
- }
-
- public State getState() {
- return state;
- }
+ this.uuid = uuid;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
+
+ public State getState() {
+ return state;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostVO.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostVO.java
index 964d7b3..2537b75 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostVO.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/HostVO.java
@@ -37,10 +37,10 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
-import com.cloud.api.Identity;
import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -134,20 +134,20 @@ public class HostVO implements Host, Identity {
@Column(name="setup")
private boolean setup = false;
-
+
@Column(name="resource_state", nullable=false)
@Enumerated(value=EnumType.STRING)
private ResourceState resourceState;
@Column(name="hypervisor_version")
private String hypervisorVersion;
-
+
@Column(name="update_count", updatable = true, nullable=false)
protected long updated; // This field should be updated everytime the state is updated. There's no set method in the vo object because it is done with in the dao code.
@Column(name="uuid")
private String uuid;
-
+
// This is a delayed load value. If the value is null,
// then this field has not been loaded yet.
// Call host dao to load it.
@@ -367,15 +367,15 @@ public class HostVO implements Host, Identity {
@Column(name=GenericDao.REMOVED_COLUMN)
private Date removed;
-
+
//orchestration
@Column(name="owner")
private String owner = null;
-
+
@Column(name="lastUpdated", updatable=true)
@Temporal(value=TemporalType.TIMESTAMP)
protected Date lastUpdated;
-
+
/**
* Note that state is intentionally missing the setter. Any updates to
* the state machine needs to go through the DAO object because someone
@@ -719,61 +719,61 @@ public class HostVO implements Host, Identity {
return hypervisorVersion;
}
- @Override
-
- // TODO, I tempoerary disable it as it breaks GenericSearchBuild when @Transient is applied
- // @Transient
- public Status getState() {
- return status;
- }
-
+ @Override
+
+ // TODO, I tempoerary disable it as it breaks GenericSearchBuild when @Transient is applied
+ // @Transient
+ public Status getState() {
+ return status;
+ }
+
@Override
public ResourceState getResourceState() {
return resourceState;
}
-
+
public void setResourceState(ResourceState state) {
- resourceState = state;
+ resourceState = state;
}
-
+
@Override
public boolean isInMaintenanceStates() {
return (getResourceState() == ResourceState.Maintenance || getResourceState() == ResourceState.ErrorInMaintenance
|| getResourceState() == ResourceState.PrepareForMaintenance);
}
-
+
public long getUpdated() {
- return updated;
- }
-
- public long incrUpdated() {
- updated++;
- return updated;
- }
-
- @Override
- public String getUuid() {
- return this.uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
-
- public Date getLastUpdated() {
- return lastUpdated;
- }
-
- public State getOrchestrationState() {
- return state;
- }
+ return updated;
+ }
+
+ public long incrUpdated() {
+ updated++;
+ return updated;
+ }
+
+ @Override
+ public String getUuid() {
+ return this.uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
+
+ public State getOrchestrationState() {
+ return state;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
index 5444a28..f710a2d 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
@@ -29,14 +29,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.storage.image.format.ISO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-import com.cloud.api.BaseCmd;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.domain.DomainVO;
@@ -48,9 +46,9 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.projects.Project.ListProjectResourcesCriteria;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.storage.Storage;
-import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
+import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.dao.VMTemplateDaoImpl;
import com.cloud.storage.dao.VMTemplateDetailsDao;
import com.cloud.storage.dao.VMTemplateZoneDao;
@@ -59,8 +57,6 @@ import com.cloud.tags.dao.ResourceTagsDaoImpl;
import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.ComponentInject;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
@@ -68,8 +64,8 @@ import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Func;
+import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@@ -78,10 +74,10 @@ public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implemen
VMTemplateZoneDao _templateZoneDao = null;
-
+
VMTemplateDetailsDao _templateDetailsDao = null;
-
+
ConfigurationDao _configDao = null;
HostDao _hostDao = null;
@@ -674,15 +670,17 @@ public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implemen
}
// for now, defaulting pageSize to a large val if null; may need to
// revisit post 2.2RC2
- if (isIso && templateZonePairList.size() < (pageSize != null ? pageSize : 500) && templateFilter != TemplateFilter.community
- && !(templateFilter == TemplateFilter.self && !BaseCmd.isRootAdmin(caller.getType()))) { // evaluates
- // to
- // true
- // If
- // root
- // admin
- // and
- // filter=self
+ if (isIso &&
+ templateZonePairList.size() < (pageSize != null ? pageSize : 500) &&
+ templateFilter != TemplateFilter.community &&
+ !(templateFilter == TemplateFilter.self) /* TODO: Fix this! && !BaseCmd.isRootAdmin(caller.getType())*/) { // evaluates
+ // to
+ // true
+ // If
+ // root
+ // admin
+ // and
+ // filter=self
List<ImageDataVO> publicIsos = publicIsoSearch(bootable, false, tags);
List<ImageDataVO> userIsos = userIsoSearch(false);
@@ -855,6 +853,7 @@ public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implemen
}
}
+ @Override
public ImageDataVO findSystemVMTemplate(long zoneId, HypervisorType hType) {
SearchCriteria<ImageDataVO> sc = tmpltTypeHyperSearch.create();
sc.setParameters("templateType", Storage.TemplateType.SYSTEM);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataVO.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataVO.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataVO.java
index 19ed0fd..e66b7bb 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataVO.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataVO.java
@@ -33,11 +33,12 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import com.cloud.api.Identity;
+import org.apache.cloudstack.api.Identity;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage;
-import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Storage.TemplateType;
+import com.cloud.storage.VMTemplateVO;
import com.cloud.utils.db.GenericDao;
@Entity
@@ -77,7 +78,7 @@ public class ImageDataVO implements Identity {
@Temporal(value = TemporalType.TIMESTAMP)
@Column(name = GenericDao.CREATED_COLUMN)
- private Date created = null;
+ private final Date created = null;
@Column(name = GenericDao.REMOVED)
@Temporal(TemporalType.TIMESTAMP)
@@ -178,7 +179,7 @@ public class ImageDataVO implements Identity {
public boolean requiresHvm() {
return requiresHvm;
}
-
+
public void setRequireHvm(boolean hvm) {
this.requiresHvm = hvm;
}
@@ -234,7 +235,7 @@ public class ImageDataVO implements Identity {
public long getAccountId() {
return accountId;
}
-
+
public void setAccountId(long accountId) {
this.accountId = accountId;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeVO.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeVO.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeVO.java
index 32e6e3b..ee1600d 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeVO.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/VolumeVO.java
@@ -32,11 +32,11 @@ import javax.persistence.TableGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.Unknown;
-import com.cloud.api.Identity;
-import com.cloud.storage.Volume;
import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.Volume;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.fsm.StateObject;
@@ -124,9 +124,9 @@ public class VolumeVO implements Identity, StateObject<Volume.State> {
@Column(name = "update_count", updatable = true, nullable = false)
protected long updatedCount; // This field should be updated everytime the
- // state is updated. There's no set method in
- // the vo object because it is done with in the
- // dao code.
+ // state is updated. There's no set method in
+ // the vo object because it is done with in the
+ // dao code.
@Column(name = "recreatable")
boolean recreatable;
@@ -345,6 +345,7 @@ public class VolumeVO implements Identity, StateObject<Volume.State> {
return updated;
}
+ @Override
public Volume.State getState() {
return state;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java
index 4a7a536..c8265c7 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreVO.java
@@ -19,7 +19,6 @@
package org.apache.cloudstack.storage.datastore.db;
import java.util.Date;
-import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -30,12 +29,10 @@ import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.persistence.Transient;
+import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.storage.datastore.DataStoreStatus;
-import com.cloud.api.Identity;
-import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.utils.db.GenericDao;
@Entity
@@ -98,7 +95,7 @@ public class PrimaryDataStoreVO implements Identity {
@Column(name = "cluster_id")
private Long clusterId;
-
+
@Column(name = "configurator_key")
private String key;
@@ -118,6 +115,7 @@ public class PrimaryDataStoreVO implements Identity {
return name;
}
+ @Override
public String getUuid() {
return uuid;
}
@@ -125,7 +123,7 @@ public class PrimaryDataStoreVO implements Identity {
public String getPoolType() {
return poolType;
}
-
+
public void setPoolType(String protocol) {
this.poolType = protocol;
}
@@ -181,7 +179,7 @@ public class PrimaryDataStoreVO implements Identity {
public String getHostAddress() {
return hostAddress;
}
-
+
public void setHostAddress(String host) {
this.hostAddress = host;
}
@@ -225,7 +223,7 @@ public class PrimaryDataStoreVO implements Identity {
public int getPort() {
return port;
}
-
+
public void setPort(int port) {
this.port = port;
}
@@ -237,13 +235,13 @@ public class PrimaryDataStoreVO implements Identity {
public void setName(String name) {
this.name = name;
}
-
+
public void setKey(String key) {
- this.key = key;
+ this.key = key;
}
-
+
public String getKey() {
- return this.key;
+ return this.key;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
----------------------------------------------------------------------
diff --git a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
index d39f87f..9236fba 100644
--- a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
+++ b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
@@ -21,22 +21,23 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
-import org.apache.cloudstack.acl.APIAccessChecker;
import org.apache.log4j.Logger;
import com.cloud.exception.PermissionDeniedException;
-import com.cloud.server.ManagementServer;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.User;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.Inject;
import com.cloud.utils.component.PluggableService;
@@ -60,6 +61,7 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
private static List<String> s_allCommands = null;
protected @Inject AccountManager _accountMgr;
+ @Inject protected List<PluggableService> _services;
protected StaticRoleBasedAPIAccessChecker() {
super();
@@ -77,10 +79,10 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
boolean commandExists = s_allCommands.contains(apiCommandName);
if(commandExists && user != null){
- Long accountId = user.getAccountId();
- Account userAccount = _accountMgr.getAccount(accountId);
- short accountType = userAccount.getType();
- return isCommandAvailableForAccount(accountType, apiCommandName);
+ Long accountId = user.getAccountId();
+ Account userAccount = _accountMgr.getAccount(accountId);
+ short accountType = userAccount.getType();
+ return isCommandAvailableForAccount(accountType, apiCommandName);
}
return commandExists;
@@ -109,13 +111,8 @@ public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIA
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
super.configure(name, params);
- // Read command properties files to build the static map per role.
- ComponentLocator locator = ComponentLocator.getLocator(ManagementServer.Name);
- List<PluggableService> services = locator.getAllPluggableServices();
- services.add((PluggableService) ComponentLocator.getComponent(ManagementServer.Name));
-
List<String> configFiles = new ArrayList<String>();
- for (PluggableService service : services) {
+ for (PluggableService service : _services) {
configFiles.addAll(Arrays.asList(service.getPropertiesFiles()));
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java b/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java
index 00b4c1f..dba92d0 100644
--- a/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java
+++ b/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java
@@ -30,10 +30,11 @@ import javax.naming.directory.InitialDirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
+import org.springframework.stereotype.Component;
-import org.apache.cloudstack.api.ApiConstants.LDAPParams;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.server.ManagementServer;
import com.cloud.user.UserAccount;
@@ -49,7 +50,7 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
private ConfigurationDao _configDao;
private UserAccountDao _userAccountDao;
-
+
@Override
public boolean authenticate(String username, String password, Long domainId, Map<String, Object[]> requestParameters ) {
if (s_logger.isDebugEnabled()) {
@@ -74,14 +75,14 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
String bindPasswd = _configDao.getValue(LDAPParams.passwd.toString());
String trustStore = _configDao.getValue(LDAPParams.truststore.toString());
String trustStorePassword = _configDao.getValue(LDAPParams.truststorepass.toString());
-
+
try {
// get all params
Hashtable<String, String> env = new Hashtable<String, String>(11);
env.put(Context.INITIAL_CONTEXT_FACTORY,"com.sun.jndi.ldap.LdapCtxFactory");
String protocol = "ldap://" ;
if (new Boolean(useSSL)){
- env.put(Context.SECURITY_PROTOCOL, "ssl");
+ env.put(Context.SECURITY_PROTOCOL, "ssl");
protocol="ldaps://" ;
System.setProperty("javax.net.ssl.trustStore", trustStore);
System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
@@ -93,10 +94,10 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
env.put(Context.SECURITY_CREDENTIALS, bindPasswd);
}
else {
- // Use anonymous authentication
- env.put(Context.SECURITY_AUTHENTICATION, "none");
+ // Use anonymous authentication
+ env.put(Context.SECURITY_AUTHENTICATION, "none");
}
- // Create the initial context
+ // Create the initial context
DirContext ctx = new InitialDirContext(env);
// use this context to search
@@ -104,7 +105,7 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
queryFilter = queryFilter.replaceAll("\\%u", username);
queryFilter = queryFilter.replaceAll("\\%n", user.getFirstname() + " " + user.getLastname());
queryFilter = queryFilter.replaceAll("\\%e", user.getEmail());
-
+
SearchControls sc = new SearchControls();
String[] searchFilter = { "dn" };
@@ -112,22 +113,22 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
sc.setReturningAttributes(searchFilter);
sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
sc.setCountLimit(1);
-
+
// Search for objects with those matching attributes
NamingEnumeration<SearchResult> answer = ctx.search(searchBase, queryFilter, sc);
- SearchResult sr = (SearchResult)answer.next();
+ SearchResult sr = answer.next();
String cn = sr.getName();
answer.close();
ctx.close();
-
+
s_logger.info("DN from LDAP =" + cn);
-
+
// check the password
env = new Hashtable<String, String>(11);
env.put(Context.INITIAL_CONTEXT_FACTORY,"com.sun.jndi.ldap.LdapCtxFactory");
protocol = "ldap://" ;
if (new Boolean(useSSL)){
- env.put(Context.SECURITY_PROTOCOL, "ssl");
+ env.put(Context.SECURITY_PROTOCOL, "ssl");
protocol="ldaps://" ;
}
env.put(Context.PROVIDER_URL, protocol + url + ":" + port);
@@ -136,22 +137,23 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
// Create the initial context
ctx = new InitialDirContext(env);
ctx.close();
-
+
} catch (NamingException ne) {
ne.printStackTrace();
s_logger.warn("Authentication failed due to " + ne.getMessage());
return false;
}
catch (Exception e){
- e.printStackTrace();
+ e.printStackTrace();
s_logger.warn("Unknown error encountered " + e.getMessage());
return false;
}
-
+
// authenticate
return true;
}
+ @Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
super.configure(name, params);
@@ -161,16 +163,16 @@ public class LDAPUserAuthenticator extends DefaultUserAuthenticator {
return true;
}
- @Override
- public String encode(String password) {
- // Password is not used, so set to a random string
- try {
- SecureRandom randomGen = SecureRandom.getInstance("SHA1PRNG");
- byte bytes[] = new byte[20];
- randomGen.nextBytes(bytes);
- return Base64.encode(bytes).toString();
- } catch (NoSuchAlgorithmException e) {
- throw new CloudRuntimeException("Failed to generate random password",e);
- }
- }
+ @Override
+ public String encode(String password) {
+ // Password is not used, so set to a random string
+ try {
+ SecureRandom randomGen = SecureRandom.getInstance("SHA1PRNG");
+ byte bytes[] = new byte[20];
+ randomGen.nextBytes(bytes);
+ return Base64.encode(bytes).toString();
+ } catch (NoSuchAlgorithmException e) {
+ throw new CloudRuntimeException("Failed to generate random password",e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14bd345f/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 9e6bc68..b6d86e1 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -85,6 +85,11 @@
<artifactId>reflections</artifactId>
<version>0.9.8</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>