cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/object_store to f41c800
Date Sat, 15 Jun 2013 02:52:50 GMT
merge to master


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f41c800d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f41c800d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f41c800d

Branch: refs/heads/object_store
Commit: f41c800d88ad3d70b022b3810b49cbd699175975
Parents: e8b0cff 8925d39
Author: Edison Su <sudison@gmail.com>
Authored: Fri Jun 14 19:06:33 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Jun 14 19:06:33 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkModel.java     |    2 +
 .../api/command/admin/host/ListHostsCmd.java    |    7 -
 .../admin/storage/ListStoragePoolsCmd.java      |    7 -
 .../command/user/snapshot/ListSnapshotsCmd.java |    8 +
 .../api/command/user/vm/ListVMsCmd.java         |    7 -
 .../api/command/user/volume/ListVolumesCmd.java |    5 -
 .../api/response/FirewallResponse.java          |    8 +-
 .../api/response/SnapshotResponse.java          |    7 +
 .../service/controller/s3/ServiceProvider.java  |    6 +-
 client/tomcatconf/nonossComponentContext.xml.in |    1 +
 .../src/com/cloud/agent/api/ScaleVmCommand.java |   26 +-
 .../virtualnetwork/VirtualRoutingResource.java  |   50 +-
 docs/en-US/CloudStack_GSoC_Guide.xml            |    2 +-
 docs/en-US/add-remove-nic-ui.xml                |  147 ++
 docs/en-US/build-rpm.xml                        |    1 +
 docs/en-US/gsoc-meng.xml                        |  235 +++
 docs/en-US/images/remove-nic.png                |  Bin 0 -> 735 bytes
 docs/en-US/images/set-default-nic.png           |  Bin 0 -> 1012 bytes
 docs/en-US/networks.xml                         |    1 +
 docs/en-US/pvlan.xml                            |  202 ++-
 docs/en-US/using-multiple-guest-networks.xml    |    1 +
 .../orchestration/CloudOrchestrator.java        |    8 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java |   24 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java |    1 +
 .../rules/dao/PortForwardingRulesDao.java       |    2 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java   |    9 +-
 .../storage/dao/SnapshotPolicyDaoImpl.java      |    1 -
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |    1 +
 .../src/com/cloud/usage/dao/UsageDao.java       |    5 +-
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |   64 +
 .../kvm/resource/LibvirtComputingResource.java  |    4 +-
 .../kvm/resource/LibvirtStorageVolumeDef.java   |    2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    2 +-
 .../resource/LibvirtComputingResourceTest.java  |    4 +-
 .../vmware/resource/VmwareResource.java         |   57 +-
 .../vmware/resource/VmwareResourceTest.java     |    7 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |   20 +-
 .../xen/resource/CitrixResourceBase.java        |    8 +-
 .../xen/resource/CitrixResourceBaseTest.java    |   12 +-
 scripts/network/domr/call_dnsmasq.sh            |   29 +
 scripts/network/domr/createipAlias.sh           |   26 +
 scripts/network/domr/deleteipAlias.sh           |   25 +
 server/src/com/cloud/api/ApiResponseHelper.java |   10 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  669 ++++----
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |   45 +-
 .../configuration/ConfigurationManagerImpl.java | 1621 +++++++++++-------
 .../cloud/hypervisor/HypervisorGuruBase.java    |    2 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    5 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   45 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   26 +-
 .../cloud/network/rules/RulesManagerImpl.java   |    2 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    4 +
 server/src/com/cloud/storage/VolumeManager.java |    2 +
 .../com/cloud/storage/VolumeManagerImpl.java    |    3 +-
 .../storage/download/DownloadMonitorImpl.java   |    1 -
 .../storage/snapshot/SnapshotManagerImpl.java   |    9 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |    6 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |   11 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |    4 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |    9 +-
 .../configuration/ValidateIpRangeTest.java      |   11 +-
 .../com/cloud/network/MockNetworkModelImpl.java |    5 +
 .../cloud/vm/VirtualMachineManagerImplTest.java |   13 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |    5 +
 services/console-proxy/server/js/ajaxkeys.js    |   42 +-
 .../consoleproxy/ConsoleProxyClientBase.java    |    4 +-
 .../consoleproxy/ConsoleProxyGCThread.java      |    5 +-
 .../consoleproxy/ConsoleProxyVncClient.java     |    5 +-
 .../consoleproxy/vnc/VncClientPacketSender.java |    4 +-
 .../vnc/VncServerPacketReceiver.java            |    4 +-
 setup/db/db/schema-2214to30.sql                 |    1 +
 setup/dev/advanced.cfg                          |   18 +
 test/integration/component/test_accounts.py     |    4 -
 .../component/test_advancedsg_networks.py       |   15 +-
 .../component/test_custom_hostname.py           |   20 +-
 test/integration/component/test_egress_rules.py |    1 -
 test/integration/component/test_eip_elb.py      |    6 -
 .../component/test_netscaler_configs.py         |   20 +-
 test/integration/component/test_netscaler_lb.py |   81 +-
 .../component/test_netscaler_lb_algo.py         |   56 +-
 .../component/test_netscaler_lb_sticky.py       |    6 +-
 .../component/test_network_offering.py          |    1 -
 .../component/test_project_configs.py           |    2 -
 .../component/test_project_limits.py            |    1 -
 test/integration/component/test_projects.py     |    1 -
 .../component/test_shared_networks.py           |   94 +-
 test/integration/component/test_tags.py         |    2 -
 test/integration/component/test_templates.py    |    1 -
 .../component/test_vm_passwdenabled.py          |    1 -
 test/integration/component/test_vpc.py          |    1 -
 test/integration/component/test_vpc_network.py  |  275 +--
 .../component/test_vpc_network_pfrules.py       |  487 +++---
 .../integration/component/test_vpc_offerings.py |    2 -
 test/integration/component/test_vpc_routers.py  |    4 -
 .../component/test_vpc_vm_life_cycle.py         | 1181 ++-----------
 .../component/test_vpc_vms_deployment.py        |    1 -
 ...deploy_vms_with_varied_deploymentplanners.py |   21 +-
 test/integration/smoke/test_network.py          |  376 ++--
 test/integration/smoke/test_vm_life_cycle.py    |    4 +-
 tools/apidoc/generateadmincommands.xsl          |    6 +-
 tools/apidoc/generatecommand.xsl                |    4 +-
 tools/apidoc/generatedomainadmincommands.xsl    |    4 +-
 tools/apidoc/generatetoc_footer.xsl             |    4 +-
 tools/apidoc/generateusercommands.xsl           |    4 +-
 tools/apidoc/images/cloudstack.png              |  Bin 3893 -> 8575 bytes
 tools/apidoc/images/ins_buttonshadow.gif        |  Bin 1683 -> 0 bytes
 tools/apidoc/images/insdownload_button.gif      |  Bin 2531 -> 0 bytes
 .../apidoc/images/insdownload_button_hover.gif  |  Bin 2569 -> 0 bytes
 tools/apidoc/images/insjoincomm_button.gif      |  Bin 2627 -> 0 bytes
 .../apidoc/images/insjoincomm_button_hover.gif  |  Bin 2620 -> 0 bytes
 tools/apidoc/includes/main.css                  |    2 +-
 tools/appliance/build.sh                        |    6 +-
 ui/index.jsp                                    |    1 -
 ui/scripts/configuration.js                     |    7 +-
 ui/scripts/instances.js                         |   12 +-
 ui/scripts/network.js                           |   10 +-
 ui/scripts/system.js                            |   10 +-
 ui/scripts/ui-custom/projectSelect.js           |    4 +-
 ui/scripts/ui-custom/projects.js                |    4 +-
 ui/scripts/ui/utils.js                          |    2 +-
 ui/scripts/vpc.js                               |   17 +-
 ui/scripts/zoneWizard.js                        |    2 +
 .../cloud/usage/parser/NetworkUsageParser.java  |   11 +-
 .../cloud/usage/parser/VmDiskUsageParser.java   |   59 +-
 utils/src/com/cloud/utils/Ternary.java          |    2 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |   40 +
 utils/test/com/cloud/utils/TernaryTest.java     |   35 +
 .../test/com/cloud/utils/net/NetUtilsTest.java  |   13 +
 128 files changed, 3532 insertions(+), 3016 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
----------------------------------------------------------------------
diff --cc engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
index 662ad43,5394a8f..7635922
--- a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
@@@ -62,10 -63,9 +62,9 @@@ public class SnapshotPolicyDaoImpl exte
      public List<SnapshotPolicyVO> listByVolumeId(long volumeId, Filter filter) {
          SearchCriteria<SnapshotPolicyVO> sc = VolumeIdSearch.create();
          sc.setParameters("volumeId", volumeId);
-         sc.setParameters("active", true);
          return listBy(sc, filter);
      }
 -	
 +
      @Override
      public Pair<List<SnapshotPolicyVO>, Integer> listAndCountByVolumeId(long
volumeId) {
          return listAndCountByVolumeId(volumeId, null);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 6d9265d,5b6b546..e360c98
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@@ -438,26 -440,30 +438,30 @@@ public class XcpServerDiscoverer extend
              return new XcpServer16Resource();
          } // Citrix Xenserver group of hypervisors
          else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
 -            return new XenServer56Resource();
 +    		return new XenServer56Resource();
          else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.0"))
 -            return new XenServer600Resource();
 +    		return new XenServer600Resource();
          else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
 -            return new XenServer602Resource();
 +    		return new XenServer602Resource();
          else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0"))
              return new XenServer610Resource();
+         else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.83"))
+             return new XenServer610Resource();
+         else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0"))
+             return new XenServer610Resource();
          else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.100"))
{
 -            String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
 +    		String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
              if ("5.6 SP2".equals(prodVersionTextShort)) {
 -                return new XenServer56SP2Resource();
 +    			return new XenServer56SP2Resource();
              } else if ("5.6 FP1".equals(prodVersionTextShort)) {
 -                return new XenServer56FP1Resource();
 -            }
 +    			return new XenServer56FP1Resource();
 +    		}
          } else if (prodBrand.equals("XCP_Kronos")) {
-     		return new XcpOssResource();
-     	}
- 
-         String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6,
 XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0 but this one is " + prodBrand
+ " " + prodVersion;
-     			_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
+             return new XcpOssResource();
+         }
+     	
+         String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6,
 XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.1.83, 6.2.0 but this
one is " + prodBrand + " " + prodVersion;
 -    			_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
++    	_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
      	s_logger.debug(msg);
      	throw new RuntimeException(msg);
  
@@@ -604,11 -614,11 +612,11 @@@
                  resource = XenServer56FP1Resource.class.getName();
              }
          } else if (prodBrand.equals("XCP_Kronos")) {
 -            resource = XcpOssResource.class.getName();
 +        	resource = XcpOssResource.class.getName();
          }
 -        
 +
          if( resource == null ){
-             String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer
5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0 but this one is " + prodBrand + " "
+ prodVersion;
+             String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer
5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0, 6.1.83, 6.2.0 but this one is " +
prodBrand + " " + prodVersion;
              s_logger.debug(msg);
              throw new RuntimeException(msg);
          }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f41c800d/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------


Mime
View raw message