You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/03/29 08:42:54 UTC
[1/3] git commit: updated refs/heads/affinity_groups to 2455843
Updated Branches:
refs/heads/affinity_groups edb12b1d9 -> 245584308
Adding the missing header!
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fff07508
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fff07508
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fff07508
Branch: refs/heads/affinity_groups
Commit: fff07508f779a8569f1296151f9e2993b7393c25
Parents: edb12b1
Author: Prachi Damle <pr...@cloud.com>
Authored: Fri Mar 29 00:20:31 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Fri Mar 29 00:20:31 2013 -0700
----------------------------------------------------------------------
.../cloudstack/affinity/AffinityProcessorBase.java | 16 +++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fff07508/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java b/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java
index 74fdde1..70ecd08 100644
--- a/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java
+++ b/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java
@@ -1,3 +1,19 @@
+// 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 this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
package org.apache.cloudstack.affinity;
import com.cloud.deploy.DeploymentPlan;
[3/3] git commit: updated refs/heads/affinity_groups to 2455843
Posted by pr...@apache.org.
Removing the files not present on origin.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24558430
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24558430
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24558430
Branch: refs/heads/affinity_groups
Commit: 24558430831225bac79ceff75f8a363d23f99749
Parents: 4fee677
Author: Prachi Damle <pr...@cloud.com>
Authored: Fri Mar 29 00:41:19 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Fri Mar 29 00:41:19 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/server/ManagementServerImpl.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24558430/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index db70a3b..1cd2597 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2191,13 +2191,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
cmdList.add(CreateVMSnapshotCmd.class);
cmdList.add(RevertToSnapshotCmd.class);
cmdList.add(DeleteVMSnapshotCmd.class);
- cmdList.add(AddIpToVmNicCmd.class);
- cmdList.add(RemoveIpFromVmNicCmd.class);
- cmdList.add(ListNicsCmd.class);
- cmdList.add(ArchiveAlertsCmd.class);
- cmdList.add(DeleteAlertsCmd.class);
- cmdList.add(ArchiveEventsCmd.class);
- cmdList.add(DeleteEventsCmd.class);
cmdList.add(CreateAffinityGroupCmd.class);
cmdList.add(DeleteAffinityGroupCmd.class);
cmdList.add(ListAffinityGroupsCmd.class);
[2/3] git commit: updated refs/heads/affinity_groups to 2455843
Posted by pr...@apache.org.
Changes to AbstractDeployPlannerSelector were missing
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4fee6776
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4fee6776
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4fee6776
Branch: refs/heads/affinity_groups
Commit: 4fee6776762b71f56a5d58ff49d6e52ed4efedc6
Parents: fff0750
Author: Prachi Damle <pr...@cloud.com>
Authored: Fri Mar 29 00:27:29 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Fri Mar 29 00:27:29 2013 -0700
----------------------------------------------------------------------
.../deploy/AbstractDeployPlannerSelector.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4fee6776/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java b/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java
index 62094eb..b52791d 100755
--- a/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java
+++ b/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java
@@ -18,15 +18,22 @@ package com.cloud.deploy;
import java.util.Map;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.configuration.Config;
+import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.vm.UserVmVO;
public abstract class AbstractDeployPlannerSelector implements DeployPlannerSelector {
protected Map<String, Object> params;
protected String name;
protected int runLevel;
-
+
+ @Inject
+ protected ConfigurationDao _configDao;
+ protected String _allocationAlgorithm = "random";
+
@Override
public String getName() {
return name;
@@ -59,6 +66,7 @@ public abstract class AbstractDeployPlannerSelector implements DeployPlannerSele
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+ _allocationAlgorithm = _configDao.getValue(Config.VmAllocationAlgorithm.key());
return true;
}