cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [49/50] [abbrv] git commit: updated refs/heads/ui-vm-affinity to 922b51c
Date Mon, 22 Apr 2013 21:04:14 GMT
Merge branch 'master' into ui-vm-affinity

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/scripts/cloudStack.js
	ui/scripts/instanceWizard.js


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

Branch: refs/heads/ui-vm-affinity
Commit: 7b011e7ef468b51a1ba903cfac8e5a9726e34ae8
Parents: e5cea02 df039aa
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Apr 22 13:45:29 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Apr 22 13:45:29 2013 -0700

----------------------------------------------------------------------
 CHANGES                                            |  385 +-
 README.md                                          |    6 +-
 .../agent/api/DeleteSnapshotBackupCommand.java     |    6 +-
 .../cloud/agent/api/MigrateWithStorageAnswer.java  |   39 +
 .../cloud/agent/api/MigrateWithStorageCommand.java |   45 +
 .../api/MigrateWithStorageCompleteAnswer.java      |   38 +
 .../api/MigrateWithStorageCompleteCommand.java     |   36 +
 .../agent/api/MigrateWithStorageReceiveAnswer.java |   55 +
 .../api/MigrateWithStorageReceiveCommand.java      |   45 +
 .../agent/api/MigrateWithStorageSendAnswer.java    |   39 +
 .../agent/api/MigrateWithStorageSendCommand.java   |   58 +
 .../agent/api/storage/MigrateVolumeAnswer.java     |   38 +
 .../agent/api/storage/MigrateVolumeCommand.java    |   51 +
 .../cloud/hypervisor/HypervisorCapabilities.java   |    2 +
 api/src/com/cloud/network/IpAddress.java           |    9 -
 api/src/com/cloud/network/Network.java             |   14 +-
 api/src/com/cloud/network/NetworkService.java      |    2 +-
 api/src/com/cloud/network/PhysicalNetwork.java     |    5 +-
 api/src/com/cloud/network/PublicIpAddress.java     |    3 -
 api/src/com/cloud/network/element/IpDeployer.java  |    6 +-
 api/src/com/cloud/offering/NetworkOffering.java    |    2 +
 api/src/com/cloud/server/ManagementService.java    |   21 +-
 api/src/com/cloud/user/Account.java                |    4 +
 api/src/com/cloud/user/User.java                   |    2 +
 api/src/com/cloud/vm/UserVmService.java            |   27 +
 .../cloudstack/affinity/AffinityGroupResponse.java |    5 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    6 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |    6 +
 .../api/command/admin/config/ListCfgsByCmd.java    |   24 +-
 .../admin/config/ListDeploymentPlannersCmd.java    |   71 -
 .../api/command/admin/config/UpdateCfgCmd.java     |   22 +-
 .../admin/host/FindHostsForMigrationCmd.java       |  107 +
 .../api/command/admin/host/ListHostsCmd.java       |    7 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    8 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |    6 -
 .../storage/FindStoragePoolsForMigrationCmd.java   |   98 +
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |  160 +
 .../api/command/user/tag/CreateTagsCmd.java        |    2 +-
 .../api/command/user/tag/DeleteTagsCmd.java        |    2 +-
 .../api/command/user/tag/ListTagsCmd.java          |    2 +-
 .../api/command/user/vm/DeployVMCmd.java           |    5 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   11 +-
 .../api/command/user/volume/MigrateVolumeCmd.java  |    8 +
 .../cloudstack/api/response/AccountResponse.java   |    7 +
 .../api/response/ConfigurationResponse.java        |   12 +
 .../api/response/HostForMigrationResponse.java     |  365 +
 .../cloudstack/api/response/HostResponse.java      |    1 -
 .../response/StoragePoolForMigrationResponse.java  |  248 +
 .../api/response/StoragePoolResponse.java          |    3 -
 .../cloudstack/api/response/UserResponse.java      |    8 +
 .../cloudstack/api/response/UserVmResponse.java    |    7 +
 .../api/command/test/ListCfgCmdTest.java           |   89 +
 .../api/command/test/UpdateCfgCmdTest.java         |  116 +
 build/replace.properties                           |    1 +
 .../WEB-INF/classes/resources/messages.properties  | 1860 ++--
 .../classes/resources/messages_fr_FR.properties    |  216 +-
 client/tomcatconf/applicationContext.xml.in        |    9 +-
 client/tomcatconf/commands.properties.in           |    3 +
 client/tomcatconf/componentContext.xml.in          |   16 +-
 client/tomcatconf/nonossComponentContext.xml.in    |   16 +-
 client/tomcatconf/simulatorComponentContext.xml.in |    9 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |   24 +-
 core/src/com/cloud/user/AccountVO.java             |    7 +
 core/src/com/cloud/user/UserVO.java                |   11 +-
 docs/en-US/Admin_Guide.xml                         |    2 +-
 docs/en-US/Book_Info.xml                           |    2 +-
 docs/en-US/CloudStack_Nicira_NVP_Guide.xml         |    2 +-
 docs/en-US/Common_Content/feedback.xml             |   24 +
 docs/en-US/Developers_Guide.xml                    |    2 +-
 docs/en-US/Installation_Guide.xml                  |    2 +-
 docs/en-US/Preface.xml                             |    2 +-
 docs/en-US/Release_Notes.xml                       |11164 ++++++++-------
 docs/en-US/advanced-zone-configuration.xml         |    2 +-
 docs/en-US/advanced-zone-network-traffic-types.xml |    2 +-
 docs/en-US/basic-zone-network-traffic-types.xml    |    4 +-
 docs/en-US/build-nonoss.xml                        |   49 +
 docs/en-US/changed-API-commands-4.2.xml            |  107 +
 docs/en-US/feedback.xml                            |   24 +
 docs/en-US/hypervisor-kvm-install-flow.xml         |    2 +-
 .../hypervisor-support-for-primarystorage.xml      |  148 +-
 docs/en-US/images/VMSnapshotButton.png             |  Bin 0 -> 967 bytes
 docs/en-US/images/revert-vm.png                    |  Bin 0 -> 860 bytes
 docs/en-US/limit-accounts-domains.xml              |  371 +
 docs/en-US/source-build.xml                        |    4 +-
 docs/en-US/source.xml                              |    1 +
 .../troubleshooting-working-with-server-logs.xml   |    6 +-
 docs/en-US/virtual-machines.xml                    |    1 +
 docs/en-US/vm-snapshots.xml                        |  146 +
 docs/en-US/work-with-usage.xml                     |   26 +-
 .../api/storage/ObjectInDataStoreStateMachine.java |    2 +
 .../subsystem/api/storage/VolumeService.java       |    7 +-
 .../datastore/db/StoragePoolDetailsDao.java        |    1 +
 .../engine/cloud/entity/api/VMEntityManager.java   |    2 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |   53 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |    2 +-
 .../cloudstack/storage/image/ImageServiceImpl.java |   85 +-
 .../driver/AncientImageDataStoreDriverImpl.java    |   10 +-
 .../image/motion/DefaultImageMotionStrategy.java   |   18 +
 .../storage/test/MockStorageMotionStrategy.java    |   19 +
 .../storage/snapshot/SnapshotObject.java           |    2 +-
 .../storage/motion/AncientDataMotionStrategy.java  |   89 +-
 .../storage/motion/DataMotionService.java          |    9 +
 .../storage/motion/DataMotionServiceImpl.java      |   16 +
 .../storage/motion/DataMotionStrategy.java         |   10 +
 .../cloudstack/storage/volume/VolumeObject.java    |    2 +
 .../storage/volume/VolumeServiceImpl.java          |  174 +-
 packaging/centos63/cloud-usage.rc                  |    2 +-
 packaging/centos63/cloud.spec                      |    9 +-
 packaging/centos63/replace.properties              |    2 +-
 packaging/debian/init/cloud-management             |    2 +-
 packaging/debian/replace.properties                |    2 +-
 .../debian/config/etc/init.d/cloud-early-config    |   53 +-
 .../manager/allocator/impl/RandomAllocator.java    |   56 +
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   51 +-
 .../kvm/resource/LibvirtComputingResource.java     |   25 +-
 .../xen/resource/CitrixResourceBase.java           |    4 +-
 .../xen/resource/XenServer56FP1Resource.java       |    1 +
 .../xen/resource/XenServer610Resource.java         |  359 +-
 .../motion/XenServerStorageMotionStrategy.java     |  239 +
 .../cloud/network/element/NiciraNvpElement.java    |    5 +
 .../network/element/NiciraNvpElementTest.java      |  238 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |    3 +-
 pom.xml                                            |   16 +
 server/pom.xml                                     |    2 +-
 .../agent/manager/allocator/HostAllocator.java     |   23 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |   47 +
 .../manager/allocator/impl/TestingAllocator.java   |    7 +
 server/src/com/cloud/api/ApiDBUtils.java           |   19 +
 server/src/com/cloud/api/ApiResponseHelper.java    |   39 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   29 +-
 .../com/cloud/api/query/ViewResponseHelper.java    |   37 +
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |    8 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java    |    1 +
 .../src/com/cloud/api/query/dao/HostJoinDao.java   |    5 +
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |  135 +-
 .../cloud/api/query/dao/StoragePoolJoinDao.java    |    6 +
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |   59 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    1 +
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    1 +
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   10 +
 .../cloud/api/query/vo/AffinityGroupJoinVO.java    |   11 +
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |   16 +-
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |   13 +
 server/src/com/cloud/configuration/Config.java     |   58 +-
 .../cloud/configuration/ConfigurationManager.java  |    5 +-
 .../configuration/ConfigurationManagerImpl.java    |  112 +-
 .../cloud/configuration/dao/ConfigurationDao.java  |    1 +
 .../AgentBasedConsoleProxyManager.java             |    8 +-
 .../src/com/cloud/consoleproxy/AgentHookBase.java  |   50 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   21 +-
 server/src/com/cloud/dc/dao/DataCenterVnetDao.java |    6 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |   50 +-
 server/src/com/cloud/dc/dao/VlanDao.java           |    2 +
 server/src/com/cloud/dc/dao/VlanDaoImpl.java       |   19 +
 .../deploy/DeploymentPlanningManagerImpl.java      |   14 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |   14 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |    4 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   20 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |  300 +-
 server/src/com/cloud/network/addr/PublicIp.java    |   18 +-
 server/src/com/cloud/network/dao/IPAddressVO.java  |    2 -
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |   20 +-
 .../network/element/VirtualRouterElement.java      |    2 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   14 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    5 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   16 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |   12 +-
 .../src/com/cloud/server/ConfigurationServer.java  |    5 +
 .../com/cloud/server/ConfigurationServerImpl.java  |  107 +-
 server/src/com/cloud/server/Criteria.java          |   11 +-
 server/src/com/cloud/server/ManagementServer.java  |    3 +
 .../src/com/cloud/server/ManagementServerImpl.java |  396 +-
 .../src/com/cloud/service/ServiceOfferingVO.java   |   23 -
 .../ConsoleProxyPasswordBasedEncryptor.java        |   99 +-
 .../src/com/cloud/servlet/ConsoleProxyServlet.java |   16 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    4 +-
 server/src/com/cloud/storage/VolumeManager.java    |    8 +
 .../src/com/cloud/storage/VolumeManagerImpl.java   |  112 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    9 +
 .../storage/snapshot/SnapshotManagerImpl.java      |   11 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   17 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |   44 +-
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |   14 +-
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |    9 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   15 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  134 +-
 server/src/com/cloud/vm/UserVmStateListener.java   |   21 +-
 server/src/com/cloud/vm/VirtualMachineManager.java |    4 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  249 +-
 .../affinity/AffinityGroupServiceImpl.java         |    2 +-
 .../cloudstack/affinity/AffinityGroupVO.java       |    2 +-
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |   11 +
 .../configuration/ConfigurationManagerTest.java    |    4 +-
 .../com/cloud/network/MockNetworkManagerImpl.java  |    2 +-
 .../cloud/network/UpdatePhysicalNetworkTest.java   |   68 +
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |    8 +
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |   10 +
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  231 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    7 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |    2 +-
 server/test/com/cloud/vpc/Site2SiteVpnTest.java    |    2 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java      |  167 +-
 .../test/com/cloud/vpc/VpcTestConfiguration.java   |   73 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |  253 +-
 setup/db/db/schema-40to410.sql                     |    4 +-
 setup/db/db/schema-410to420.sql                    |  346 +-
 test/integration/component/test_accounts.py        |   10 +-
 .../component/test_allocation_states.py            |    2 +-
 test/integration/component/test_blocker_bugs.py    |    8 +-
 test/integration/component/test_egress_rules.py    |   13 +-
 test/integration/component/test_eip_elb.py         |    3 +-
 .../integration/component/test_network_offering.py |    5 +-
 test/integration/component/test_project_configs.py |    6 +-
 test/integration/component/test_project_limits.py  |    4 +-
 .../component/test_project_resources.py            |    7 +-
 test/integration/component/test_project_usage.py   |   10 +-
 test/integration/component/test_projects.py        |    8 +-
 test/integration/component/test_resource_limits.py |    4 +-
 test/integration/component/test_routers.py         |    5 +-
 test/integration/component/test_security_groups.py |    9 +-
 test/integration/component/test_snapshots.py       |    8 +-
 test/integration/component/test_storage_motion.py  |  298 +
 test/integration/component/test_templates.py       |    3 +-
 test/integration/component/test_usage.py           |   10 +-
 .../integration/component/test_vm_passwdenabled.py |    1 +
 test/integration/component/test_volumes.py         |    6 +-
 test/integration/smoke/test_ScaleVm.py             |  221 -
 test/integration/smoke/test_global_settings.py     |   72 +
 test/integration/smoke/test_iso.py                 |    2 +-
 test/integration/smoke/test_network.py             |    2 +-
 test/integration/smoke/test_non_contigiousvlan.py  |   86 +
 test/integration/smoke/test_public_ip_range.py     |    2 +-
 test/integration/smoke/test_routers.py             |    2 +-
 test/integration/smoke/test_scale_vm.py            |  221 +
 test/integration/smoke/test_templates.py           |    2 +-
 test/integration/smoke/test_volumes.py             |    2 +-
 tools/apidoc/gen_toc.py                            |    1 +
 .../definitions/systemvmtemplate/cleanup.sh        |    1 -
 .../definitions/systemvmtemplate64/cleanup.sh      |    1 -
 tools/build/build_asf.sh                           |   91 +-
 tools/build/setnextversion.sh                      |   75 +
 tools/cli/cloudmonkey/requester.py                 |    4 +-
 tools/marvin/marvin/asyncJobMgr.py                 |    2 +-
 tools/marvin/marvin/cloudstackConnection.py        |  274 +-
 tools/marvin/marvin/cloudstackTestClient.py        |    3 +-
 tools/marvin/marvin/codegenerator.py               |    4 +-
 tools/marvin/marvin/deployDataCenter.py            |    1 -
 tools/marvin/marvin/integration/lib/base.py        |   24 +-
 tools/marvin/marvin/integration/lib/common.py      |    4 +-
 tools/marvin/marvin/jsonHelper.py                  |    7 +-
 tools/marvin/setup.py                              |    1 +
 ui/css/cloudstack3.css                             |   81 +-
 ui/index.jsp                                       |    9 +-
 ui/modules/modules.js                              |   20 +
 ui/scripts/accounts.js                             |    7 +
 ui/scripts/cloudStack.js                           |    6 +-
 ui/scripts/instanceWizard.js                       |    1 -
 ui/scripts/instances.js                            |   66 +-
 ui/scripts/network.js                              |   51 +-
 ui/scripts/plugins.js                              |   95 +-
 ui/scripts/regions.js                              |  308 +-
 ui/scripts/storage.js                              |  117 +-
 ui/scripts/system.js                               |   65 +-
 ui/scripts/templates.js                            |  134 +-
 ui/scripts/ui-custom/pluginListing.js              |  109 +
 ui/scripts/ui-custom/plugins.js                    |  109 -
 ui/scripts/ui-custom/projectSelect.js              |   66 +
 ui/scripts/ui-custom/projects.js                   |    6 +-
 ui/scripts/ui-custom/zoneFilter.js                 |   39 +
 ui/scripts/zoneWizard.js                           |   26 +-
 usage/pom.xml                                      |    5 +
 usage/src/com/cloud/usage/UsageManagerImpl.java    |   10 +-
 usage/src/com/cloud/usage/UsageServer.java         |   16 +-
 273 files changed, 16531 insertions(+), 8262 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index 349ca2e,fbc0471..461cc11
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,909 -14,132 +14,141 @@@
  # KIND, either express or implied.  See the License for the
  # specific language governing permissions and limitations
  # under the License.
--
- 
- #new labels (begin) **********************************************************************************************
 +label.add.affinity.group=Add new affinity group
 +message.delete.affinity.group=Please confirm that you would like to remove this affinity group.
 +label.delete.affinity.group=Delete Affinity Group
 +label.edit.affinity.group=Edit Affinity Group
 +label.affinity=Affinity
 +label.anti.affinity=Anti-affinity
 +label.affinity.groups=Affinity Groups
 +label.anti.affinity.groups=Anti-affinity Groups
 +label.affinity.group=Affinity Group
 +label.anti.affinity.group=Anti-affinity Group
- message.redirecting.region=Redirecting to region...
- label.use.vm.ip=Use VM IP:
- label.cpu.limits=CPU limits
- label.memory.limits=Memory limits (MiB)
- label.primary.storage.limits=Primary Storage limits (GiB)
- label.secondary.storage.limits=Secondary Storage limits (GiB)
- label.max.cpus=Max. CPU cores
- label.max.memory=Max. memory (MiB)
- label.max.primary.storage=Max. primary (GiB)
- label.max.secondary.storage=Max. secondary (GiB)
- label.menu.regions=Regions
- label.region=Region
- label.add.region=Add Region
- label.remove.region=Remove Region
- message.remove.region=Are you sure you want to remove this region from this management server?
- message.add.region=Please specify the required information to add a new region.
- label.endpoint=Endpoint
- label.plugins=Plugins
- label.plugin.details=Plugin details
- label.author.name=Author name
- label.author.email=Author e-mail
- label.external.link=External link
- label.egress.rules=Egress rules
- message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
- label.zoneWizard.trafficType.management=Management: Traffic between CloudStack\'s internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs
- label.zoneWizard.trafficType.public=Public: Traffic between the internet and virtual machines in the cloud.
- label.zoneWizard.trafficType.guest=Guest: Traffic between end-user virtual machines
- label.zoneWizard.trafficType.storage=Storage: Traffic between primary and secondary storage servers, such as VM templates and snapshots
- label.quickview=Quickview
- label.migrate.to.host=Migrate to host
- label.migrate.to.storage=Migrate to storage
- label.stop=Stop
- label.reboot=Reboot
- label.destroy=Destroy
- label.restore=Restore
- label.isolation.uri=Isolation URI
- label.broadcast.uri=Broadcast URI
- label.enable.s3=Enable S3-backed Secondary Storage
- confirm.enable.s3=Please fill in the following information to enable support for S3-backed Secondary Storage
- message.after.enable.s3=S3-backed Secondary Storage configured. Note: When you leave this page, you will not be able to re-configure S3 again.
- label.s3.access_key=Access Key
- label.s3.secret_key=Secret Key
- label.s3.bucket=Bucket
- label.s3.endpoint=Endpoint
- label.s3.use_https=Use HTTPS
- label.s3.connection_timeout=Connection Timeout
- label.s3.max_error_retry=Max Error Retry
- label.s3.socket_timeout=Socket Timeout
- #new labels (end) ************************************************************************************************
- 
- 
- #modified labels (begin) *****************************************************************************************
- label.site.to.site.VPN=Site-to-site VPN
- message.zoneWizard.enable.local.storage=WARNING: If you enable local storage for this zone, you must do the following, depending on where you would like your system VMs to launch:<br/><br/>1. If system VMs need to be launched in primary storage, primary storage needs to be added to the zone after creation. You must also start the zone in a disabled state.<br/><br/>2. If system VMs need to be launched in local storage, system.vm.use.local.storage needs to be set to true before you enable the zone.<br/><br/><br/>Would you like to continue?
- #modified labels (end) *******************************************************************************************
- 
- label.configure.network.ACLs=Configure Network ACLs
- label.network.ACLs=Network ACLs
- label.add.network.ACL=Add network ACL
- label.private.Gateway=Private Gateway
- label.VPC.router.details=VPC router details
- label.VMs.in.tier=VMs in tier
- label.local.storage.enabled=Local storage enabled
- label.tier.details=Tier details
- label.edit.tags=Edit tags
- label.action.enable.physical.network=Enable physical network
- label.action.disable.physical.network=Disable physical network
- message.action.enable.physical.network=Please confirm that you want to enable this physical network.
- message.action.disable.physical.network=Please confirm that you want to disable this physical network.
- 
- label.select.tier=Select Tier
- label.add.ACL=Add ACL
- label.remove.ACL=Remove ACL
- label.tier=Tier
- label.network.ACL=Network ACL
- label.network.ACL.total=Network ACL Total
- label.add.new.gateway=Add new gateway
- message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC.
- label.delete.gateway=delete gateway
- message.delete.gateway=Please confirm you want to delete the gateway
- label.CIDR.of.destination.network=CIDR of destination network
- label.add.route=Add route
- label.add.static.route=Add static route
- label.remove.static.route=Remove static route
- label.add.VPN.gateway=Add VPN Gateway
- message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway
- label.VPN.gateway=VPN Gateway
- label.delete.VPN.gateway=delete VPN Gateway
- message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway
- label.VPN.connection=VPN Connection
- label.IPsec.preshared.key=IPsec Preshared-Key
- label.IKE.policy=IKE policy
- label.ESP.policy=ESP policy
- label.create.VPN.connection=Create VPN Connection
- label.VPN.customer.gateway=VPN Customer Gateway
- label.CIDR.list=CIDR list
- label.IKE.lifetime=IKE Lifetime (second)
- label.ESP.lifetime=ESP Lifetime(second)
- label.dead.peer.detection=Dead Peer Detection
- label.reset.VPN.connection=Reset VPN connection
- message.reset.VPN.connection=Please confirm that you want to reset VPN connection
- label.delete.VPN.connection=delete VPN connection
- message.delete.VPN.connection=Please confirm that you want to delete VPN connection
- label.add.new.tier=Add new tier
- label.add.VM.to.tier=Add VM to tier
- label.remove.tier=Remove tier
- 
- label.local.storage.enabled=Local Storage Enabled
- label.associated.network=Associated Network
- label.add.port.forwarding.rule=Add port forwarding rule
- label.dns=DNS
- 
- label.vpc=VPC
- label.vpc.id=VPC ID
- label.tier=Tier
- label.add.vpc=Add VPC
- label.super.cidr.for.guest.networks=Super CIDR for Guest Networks
- label.DNS.domain.for.guest.networks=DNS domain for Guest Networks
- label.configure.vpc=Configure VPC
- label.edit.vpc=Edit VPC
- label.restart.vpc=restart VPC
- message.restart.vpc=Please confirm that you want to restart the VPC
- label.remove.vpc=remove VPC
- message.remove.vpc=Please confirm that you want to remove the VPC
- label.vpn.customer.gateway=VPN Customer Gateway
- label.add.vpn.customer.gateway=Add VPN Customer Gateway
- label.IKE.encryption=IKE Encryption
- label.IKE.hash=IKE Hash
- label.IKE.DH=IKE DH
- label.ESP.encryption=ESP Encryption
- label.ESP.hash=ESP Hash
- label.perfect.forward.secrecy=Perfect Forward Secrecy
- label.IKE.lifetime=IKE lifetime (second)
- label.ESP.lifetime=ESP Lifetime (second)
- label.dead.peer.detection=Dead Peer Detection
- label.delete.VPN.customer.gateway=delete VPN Customer Gateway
- message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway
- 
- label.network.domain.text=Network domain
- label.memory.mb=Memory (in MB)
- label.cpu.mhz=CPU (in MHz)
- 
- message.action.remove.host=Please confirm that you want to remove this host.
- 
- message.action.reboot.router=All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.
- message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.
- message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network.
- 
- 
- label.ipaddress=IP Address
- label.vcdcname=vCenter DC name
- label.vcipaddress=vCenter IP Address
- label.vsmctrlvlanid=Control VLAN ID
- label.vsmpktvlanid=Packet VLAN ID
- label.vsmstoragevlanid=Storage VLAN ID
- label.nexusVswitch=Nexus 1000v
- label.action.delete.nexusVswitch=Delete Nexus 1000v
- label.action.enable.nexusVswitch=Enable Nexus 1000v
- label.action.disable.nexusVswitch=Disable Nexus 1000v
- label.action.list.nexusVswitch=List Nexus 1000v
- message.action.delete.nexusVswitch=Please confirm that you want to delete this nexus 1000v
- message.action.enable.nexusVswitch=Please confirm that you want to enable this nexus 1000v
- message.action.disable.nexusVswitch=Please confirm that you want to disable this nexus 1000v
- message.specify.url=Please specify URL
- label.select.instance.to.attach.volume.to=Select instance to attach volume to
- label.upload=Upload
- label.upload.volume=Upload volume
- label.virtual.routers=Virtual Routers
- label.primary.storage.count=Primary Storage Pools
- label.secondary.storage.count=Secondary Storage Pools
- label.number.of.system.vms=Number of System VMs
- label.number.of.virtual.routers=Number of Virtual Routers
- label.action.register.iso=Register ISO
- label.isolation.method=Isolation method
- label.action.register.template=Register template
- label.checksum=MD5 checksum
- label.vpn=VPN
- label.vlan=VLAN
- 
- 
- label.management.ips=Management IP Addresses
- label.devices=Devices
- label.rules=Rules
- label.traffic.label=Traffic label
- label.vm.state=VM state
- message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
- label.domain.router=Domain router
- label.console.proxy=Console proxy
- label.secondary.storage.vm=Secondary storage VM
- label.add.netScaler.device=Add Netscaler device
- label.add.F5.device=Add F5 device
- label.add.SRX.device=Add SRX device
- label.account.and.security.group=Account, Security group
- label.fetch.latest=Fetch latest
- label.system.offering=System Offering
- message.validate.instance.name=Instance name can not be longer than 63 characters. Only ASCII letters a~z, A~Z, digits 0~9, hyphen are allowed. Must start with a letter and end with a letter or a digit.
- 
- 
- label.isolated.networks=Isolated networks
- label.latest.events=Latest events
- state.Enabled=Enabled
- label.system.wide.capacity=System-wide capacity
- label.network.service.providers=Network Service Providers
- message.launch.zone=Zone is ready to launch; please proceed to the next step.
- error.unable.to.reach.management.server=Unable to reach Management Server
- label.internal.name=Internal name
- message.configure.all.traffic.types=You have multiple physical networks; please configure labels for each traffic type by clicking on the Edit button.
- message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type.
- label.edit.traffic.type=Edit traffic type
- label.label=Label
- label.max.networks=Max. networks
- error.invalid.username.password=Invalid username or password
- message.enabling.security.group.provider=Enabling Security Group provider
- message.adding.Netscaler.provider=Adding Netscaler provider
- message.creating.guest.network=Creating guest network
- label.action.delete.physical.network=Delete physical network
- message.action.delete.physical.network=Please confirm that you want to delete this physical network
- message.installWizard.copy.whatIsAHost=A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack&#8482; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones. 
- 
- 
- label.add.compute.offering=Add compute offering
- label.compute.offering=Compute offering
- label.compute.offerings=Compute offerings
- label.select.offering=Select offering
- label.menu.infrastructure=Infrastructure
- label.sticky.tablesize=Table size
- label.sticky.expire=Expires
- label.sticky.cookie-name=Cookie name
- label.sticky.mode=Mode
- label.sticky.length=Length
- label.sticky.holdtime=Hold time
- label.sticky.request-learn=Request learn
- label.sticky.prefix=Prefix
- label.sticky.nocache=No cache
- label.sticky.indirect=Indirect
- label.sticky.postonly=Post only
- label.sticky.domain=Domain
- state.Allocating=Allocating
- state.Migrating=Migrating
- error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
- 
- 
- state.Stopping=Stopping
- message.add.load.balancer.under.ip=The load balancer rule has been added under IP:
- message.select.instance=Please select an instance.
- label.select=Select
- label.select.vm.for.static.nat=Select VM for static NAT
- label.select.instance=Select instance
- label.nat.port.range=NAT Port Range
- label.static.nat.vm.details=Static NAT VM Details
- label.edit.lb.rule=Edit LB rule
- message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
- label.migrate.instance.to.host=Migrate instance to another host
- message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
- label.migrate.instance.to.ps=Migrate instance to another primary storage
- label.corrections.saved=Corrections saved
- message.installWizard.copy.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following:<ul><li>Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications</li><li>ISO images - OS images that can be bootable or non-bootable</li><li>Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates</ul>
- message.installWizard.copy.whatIsPrimaryStorage=A CloudStack&#8482; cloud infrastructure makes use of two types of storage: primary storage and secondary storage. Both of these can be iSCSI or NFS servers, or localdisk.<br/><br/><strong>Primary storage</strong> is associated with a cluster, and it stores the disk volumes of each guest VM for all the VMs running on hosts in that cluster. The primary storage server is typically located close to the hosts. 
- message.installWizard.copy.whatIsACluster=A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack&#8482; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack&#8482; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster. 
- message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack&#8482; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.
- message.installWizard.copy.whatIsAZone=A zone is the largest organizational unit within a CloudStack&#8482; deployment. A zone typically corresponds to a single datacenter, although it is permissible to have multiple zones in a datacenter. The benefit of organizing infrastructure into zones is to provide physical isolation and redundancy. For example, each zone can have its own power supply and network uplink, and the zones can be widely separated geographically (though this is not required).
- message.installWizard.copy.whatIsCloudStack=CloudStack&#8482 is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack&#8482 manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack&#8482 to deploy, manage, and configure cloud computing environments.<br/><br/>Extending beyond individual virtual machine images running on commodity hardware, CloudStack&#8482 provides a turnkey cloud infrastructure software stack for delivering virtual datacenters as a service - delivering all of the essential components to build, deploy, and manage multi-tier and multi-tenant cloud applications. Both open-source and Premium versions are available, with the open-source version offering nearly identical features. 
- message.installWizard.tooltip.addSecondaryStorage.path=The exported path, located on the server you specified above
- message.installWizard.tooltip.addSecondaryStorage.nfsServer=The IP address of the NFS server hosting the secondary storage
- message.installWizard.tooltip.addPrimaryStorage.path=(for NFS) In NFS this is the exported path from the server. Path (for SharedMountPoint).  With KVM this is the path on each host that is where this primary storage is mounted.  For example, "/mnt/primary".
- message.installWizard.tooltip.addPrimaryStorage.server=(for NFS, iSCSI, or PreSetup) The IP address or DNS name of the storage device.
- message.installWizard.tooltip.addPrimaryStorage.name=The name for the storage device.
- message.installWizard.tooltip.addHost.password=This is the password for the user named above (from your XenServer install).
- message.installWizard.tooltip.addHost.username=Usually root.
- message.installWizard.tooltip.addHost.hostname=The DNS name or IP address of the host.
- message.installWizard.tooltip.addCluster.name=A name for the cluster.  This can be text of your choosing and is not used by CloudStack.
- message.installWizard.tooltip.addPod.reservedSystemEndIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
- message.installWizard.tooltip.addPod.reservedSystemStartIp=This is the IP range in the private network that the CloudStack uses to manage Secondary Storage VMs and Console Proxy VMs. These IP addresses are taken from the same subnet as computing servers.
- message.installWizard.tooltip.addPod.reservedSystemNetmask=The netmask in use on the subnet the guests will use.
- message.installWizard.tooltip.addPod.reservedSystemGateway=The gateway for the hosts in that pod.
- message.installWizard.tooltip.addPod.name=A name for the pod
- message.installWizard.tooltip.configureGuestTraffic.guestEndIp=The range of IP addresses that will be available for allocation to guests in this zone.  If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
- message.installWizard.tooltip.configureGuestTraffic.guestStartIp=The range of IP addresses that will be available for allocation to guests in this zone.  If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.
- message.installWizard.tooltip.configureGuestTraffic.guestNetmask=The netmask in use on the subnet that the guests should use
- message.installWizard.tooltip.configureGuestTraffic.guestGateway=The gateway that the guests should use
- message.installWizard.tooltip.configureGuestTraffic.description=A description for your network
- message.installWizard.tooltip.configureGuestTraffic.name=A name for your network
- message.installWizard.tooltip.addZone.internaldns2=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
- message.installWizard.tooltip.addZone.internaldns1=These are DNS servers for use by system VMs in the zone. These DNS servers will be accessed via the private network interface of the System VMs. The private IP address you provide for the pods must have a route to the DNS server named here.
- message.installWizard.tooltip.addZone.dns2=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
- message.installWizard.tooltip.addZone.name=A name for the zone
- message.installWizard.tooltip.addZone.dns1=These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed via the public network you will add later. The public IP addresses for the zone must have a route to the DNS server named here.
- message.setup.successful=Cloud setup successful!
- label.may.continue=You may now continue.
- error.installWizard.message=Something went wrong; you may go back and correct any errors
- message.installWizard.now.building=Now building your cloud... 
- message.installWizard.click.retry=Click the button to retry launch.
- label.launch=Launch
- label.installWizard.click.launch=Click the launch button.
- label.congratulations=Congratulations!
- label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage?
- label.installWizard.addSecondaryStorageIntro.title=Let&rsquo;s add secondary storage
- label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage?
- label.installWizard.addPrimaryStorageIntro.title=Let&rsquo;s add primary storage
- label.installWizard.addHostIntro.subtitle=What is a host?
- label.installWizard.addHostIntro.title=Let&rsquo;s add a host
- label.installWizard.addClusterIntro.subtitle=What is a cluster?
- label.installWizard.addClusterIntro.title=Let&rsquo;s add a cluster
- label.installWizard.addPodIntro.subtitle=What is a pod?
- label.installWizard.addPodIntro.title=Let&rsquo;s add a pod
- label.installWizard.addZone.title=Add zone
- label.installWizard.addZoneIntro.subtitle=What is a zone?
- label.installWizard.addZoneIntro.title=Let&rsquo;s add a zone
- error.password.not.match=The password fields do not match
- label.confirm.password=Confirm password
- message.change.password=Please change your password.
- label.save.and.continue=Save and continue
- label.skip.guide=I have used CloudStack before, skip this guide
- label.continue.basic.install=Continue with basic installation
- label.introduction.to.cloudstack=Introduction to CloudStack&#8482
- label.what.is.cloudstack=What is CloudStack&#8482?
- label.hints=Hints
- label.installWizard.subtitle=This tour will aid you in setting up your CloudStack&#8482 installation
- label.continue=Continue
- label.installWizard.title=Hello and Welcome to CloudStack&#8482
- label.agree=Agree
- label.manage.resources=Manage Resources
- label.port.forwarding.policies=Port forwarding policies
- label.load.balancing.policies=Load balancing policies
- label.networking.and.security=Networking and security
- label.bandwidth=Bandwidth
- label.virtual.machines=Virtual machines
- label.compute.and.storage=Compute and Storage
- label.task.completed=Task completed
- label.update.project.resources=Update project resources
- label.remove.project.account=Remove project account
- label.item.listing=Item listing
- message.select.item=Please select an item.
- label.removing=Removing
- label.invite=Invite
- label.add.by=Add by
- label.max.vms=Max. user VMs
- label.max.public.ips=Max. public IPs
- label.max.volumes=Max. volumes
- label.max.snapshots=Max. snapshots
- label.max.templates=Max. templates
- label.max.vpcs=Max. VPCs
- label.project.dashboard=Project dashboard
- label.remind.later=Remind me later
- label.invited.accounts=Invited accounts
- label.invite.to=Invite to
- label.add.accounts.to=Add accounts to
- label.add.accounts=Add accounts
- label.project.name=Project name
- label.create.project=Create project
- label.networks=Networks
- label.launch.vm=Launch VM
- label.new.vm=New VM
- label.previous=Previous
- label.add.to.group=Add to group
- message.vm.review.launch=Please review the following information and confirm that your virtual instance is correct before launch.
- message.select.security.groups=Please select security group(s) for your new VM
- label.new=New
- message.please.select.networks=Please select networks for your virtual machine.
- message.please.proceed=Please proceed to the next step.
- message.zone.no.network.selection=The zone you selected does not have any choices for network selection.
- label.no.thanks=No thanks
- label.my.templates=My templates
- message.select.template=Please select a template for your new virtual instance.
- message.select.iso=Please select an ISO for your new virtual instance.
- message.template.desc=OS image that can be used to boot VMs
- message.iso.desc=Disc image containing data or bootable media for OS
- label.select.iso.or.template=Select ISO or template
- message.select.a.zone=A zone typically corresponds to a single datacenter. Multiple zones help make the cloud more reliable by providing physical isolation and redundancy.
- label.select.a.zone=Select a zone
- label.review=Review
- label.select.a.template=Select a template
- label.setup=Setup
- state.Allocated=Allocated
- changed.item.properties=Changed item properties
- label.apply=Apply
- label.default=Default
- label.viewing=Viewing
- label.move.to.top=Move to top
- label.move.up.row=Move up one row
- label.move.down.row=Move down one row
- label.move.to.bottom=Move to bottom
- label.drag.new.position=Drag to new position
- label.order=Order
- label.no.data=No data to show
- label.change.value=Change value
- label.clear.list=Clear list
- label.full.path=Full path
- message.add.domain=Please specify the subdomain you want to create under this domain
- message.delete.user=Please confirm that you would like to delete this user.
- message.enable.user=Please confirm that you would like to enable this user.
- message.disable.user=Please confirm that you would like to disable this user.
- message.generate.keys=Please confirm that you would like to generate new keys for this user.
- message.update.resource.count=Please confirm that you want to update resource counts for this account.
- message.edit.account=Edit ("-1" indicates no limit to the amount of resources create)
- label.total.of.vm=Total of VM
- label.total.of.ip=Total of IP Address
- state.enabled=Enabled
- message.action.download.iso=Please confirm that you want to download this ISO.
- message.action.download.template=Please confirm that you want to download this template.
- label.destination.zone=Destination Zone
- label.keyboard.type=Keyboard type
- label.nic.adapter.type=NIC adapter type
- label.root.disk.controller=Root disk controller
- label.community=Community
- label.remove.egress.rule=Remove egress rule
- label.add.egress.rule=Add egress rule
- label.egress.rule=Egress rule
- label.remove.ingress.rule=Remove ingress rule
- label.delete.vpn.user=Delete VPN user
- label.add.vpn.user=Add VPN user
- label.remove.pf=Remove port forwarding rule
- label.remove.vm.from.lb=Remove VM from load balancer rule
- label.add.vms.to.lb=Add VM(s) to load balancer rule
- label.add.vm=Add VM
- label.remove.static.nat.rule=Remove static NAT rule
- label.remove.rule=Remove rule
- label.add.static.nat.rule=Add static NAT rule
- label.add.rule=Add rule
- label.configuration=Configuration
- message.disable.vpn=Are you sure you want to disable VPN?
- label.disable.vpn=Disable VPN
- message.enable.vpn=Please confirm that you want VPN access enabled for this IP address.
- label.enable.vpn=Enable VPN
- message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
- label.elastic=Elastic
- label.my.network=My network
- label.add.vms=Add VMs
- label.configure=Configure
- label.stickiness=Stickiness
- label.source=Source
- label.least.connections=Least connections
- label.round.robin=Round-robin
- label.restart.required=Restart required
- label.clean.up=Clean up
- label.restart.network=Restart network
- label.edit.network.details=Edit network details
- label.add.guest.network=Add guest network
- label.guest.networks=Guest networks
- message.ip.address.changed=Your IP addresses may have changed; would you like to refresh the listing? Note that in this case the details pane will close.
- state.BackingUp=Backing Up
- state.BackedUp=Backed Up
- label.done=Done
- label.vm.name=VM name
- message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.
- label.migrate.volume=Migrate volume to another primary storage
- message.create.template=Are you sure you want to create template?
- label.create.template=Create template
- message.download.volume.confirm=Please confirm that you want to download this volume
- message.detach.disk=Are you sure you want to detach this disk?
- state.ready=Ready
- state.Ready=Ready
- label.vm.display.name=VM display name
- label.select-view=Select view
- label.local.storage=Local Storage
- label.direct.ips=Shared Network IPs
- label.view.all=View all
- label.zone.details=Zone details
- message.alert.state.detected=Alert state detected
- state.Starting=Starting
- state.Expunging=Expunging
- state.Creating=Creating
- message.decline.invitation=Are you sure you want to decline this project invitation?
- label.decline.invitation=Decline invitation
- message.confirm.join.project=Please confirm you wish to join this project.
- message.join.project=You have now joined a project. Please switch to Project view to see the project.
- label.accept.project.invitation=Accept project invitation
- label.token=Token
- label.project.id=Project ID
- message.enter.token=Please enter the token that you were given in your invite e-mail.
- label.enter.token=Enter token
- state.Accepted=Accepted
- state.Pending=Pending
- state.Completed=Completed
- state.Declined=Declined
- label.project=Project
- label.invitations=Invitations
- label.delete.project=Delete project
- message.delete.project=Are you sure you want to delete this project?
- message.activate.project=Are you sure you want to activate this project?
- label.activate.project=Activate Project
- label.suspend.project=Suspend Project
- message.suspend.project=Are you sure you want to suspend this project?
- state.Suspended=Suspended
- label.edit.project.details=Edit project details
- label.new.project=New Project
- state.Active=Active
- state.Disabled=Disabled
- label.projects=Projects
- label.make.project.owner=Make account project owner
- label.remove.project.account=Remove account from project
- message.project.invite.sent=Invite sent to user; they will be added to the project once they accept the invitation
- label.add.account.to.project=Add account to project
- label.revoke.project.invite=Revoke invitation
- label.project.invite=Invite to project
- label.select.project=Select Project
- message.no.projects=You do not have any projects.<br/>Please create a new one from the projects section.
- message.no.projects.adminOnly=You do not have any projects.<br/>Please ask your administrator to create a new project.
- message.pending.projects.1=You have pending project invitations:
- message.pending.projects.2=To view, please go to the projects section, then select invitations from the drop-down.
- message.instanceWizard.noTemplates=You do not have any templates available; please add a compatible template, and re-launch the instance wizard.
- label.view=View
- instances.actions.reboot.label=Reboot instance
- label.filterBy=Filter by
- label.ok=OK
- notification.reboot.instance=Reboot instance
- notification.start.instance=Start instance
- notification.stop.instance=Stop instance
- label.display.name=Display name
- label.zone.name=Zone name
- ui.listView.filters.all=All
- ui.listView.filters.mine=Mine
- state.Running=Running
- state.Stopped=Stopped
- state.Destroyed=Destroyed
- state.Error=Error
- message.reset.password.warning.notPasswordEnabled=The template of this instance was created without password enabled
- message.reset.password.warning.notStopped=Your instance must be stopped before attempting to change its current password
- label.notifications=Notifications
- label.default.view=Default View
- label.project.view=Project View
- 
- message.add.system.service.offering=Please fill in the following data to add a new system service offering.
- message.action.delete.system.service.offering=Please confirm that you want to delete this system service offering.
- label.action.delete.system.service.offering=Delete System Service Offering
- label.hypervisor.capabilities=Hypervisor capabilities
- label.hypervisor.version=Hypervisor version
- label.max.guest.limit=Max guest limit
- label.add.network.offering=Add network offering
- label.supported.services=Supported Services
- label.service.capabilities=Service Capabilities
- label.guest.type=Guest Type
- label.specify.IP.ranges=Specify IP ranges
- label.conserve.mode=Conserve mode
- label.created.by.system=Created by system
- label.menu.system.service.offerings=System Offerings
- label.add.system.service.offering=Add System Service Offering
- label.redundant.router.capability=Redundant router capability
- label.supported.source.NAT.type=Supported Source NAT type
- label.elastic.LB=Elastic LB
- label.LB.isolation=LB isolation
- label.elastic.IP=Elastic IP
- label.network.label.display.for.blank.value=Use default gateway
- label.xen.traffic.label=XenServer traffic label
- label.kvm.traffic.label=KVM traffic label
- label.vmware.traffic.label=VMware traffic label
- label.start.IP=Start IP
- label.end.IP=End IP
- label.remove.ip.range=Remove IP range
- label.ip.ranges=IP Ranges
- label.start.vlan=Start Vlan
- label.end.vlan=End Vlan
- label.broadcast.domain.range=Broadcast domain range
- label.compute=Compute
- message.add.guest.network=Please confirm that you would like to add a guest network
- label.subdomain.access=Subdomain Access
- label.guest.start.ip=Guest start IP
- label.guest.end.ip=Guest end IP
- label.virtual.router=Virtual Router
- label.physical.network.ID=Physical network ID
- label.destination.physical.network.id=Destination physical network ID
- label.dhcp=DHCP
- label.destroy.router=Destroy router
- message.confirm.destroy.router=Please confirm that you would like to destroy this router
- label.change.service.offering=Change service offering
- label.view.console=View console
- label.redundant.state=Redundant state
- label.enable.provider=Enable provider
- message.confirm.enable.provider=Please confirm that you would like to enable this provider
- label.disable.provider=Disable provider
- message.confirm.disable.provider=Please confirm that you would like to disable this provider
- label.shutdown.provider=Shutdown provider
- message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
- label.netScaler=NetScaler
- label.add.new.NetScaler=Add new NetScaler
- label.capacity=Capacity
- label.dedicated=Dedicated
- label.f5=F5
- label.add.new.F5=Add new F5
- label.srx=SRX
- label.providers=Providers
- label.add.new.SRX=Add new SRX
- label.timeout=Timeout
- label.public.network=Public network
- label.private.network=Private network
- label.enable.swift=Enable Swift
+ changed.item.properties=Changed item properties
+ confirm.enable.s3=Please fill in the following information to enable support for S3-backed Secondary Storage
  confirm.enable.swift=Please fill in the following information to enable support for Swift
- message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.
- label.key=Key
- label.delete.NetScaler=Delete NetScaler
- message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
- label.delete.F5=Delete F5
- message.confirm.delete.F5=Please confirm that you would like to delete F5
- label.delete.SRX=Delete SRX
- message.confirm.delete.SRX=Please confirm that you would like to delete SRX
- label.pods=Pods
- label.pod.name=Pod name
- label.reserved.system.gateway=Reserved system gateway
- label.reserved.system.netmask=Reserved system netmask
- label.start.reserved.system.IP=Start Reserved system IP
- label.end.reserved.system.IP=End Reserved system IP
- label.clusters=Clusters
- label.cluster.name=Cluster Name
- label.host.MAC=Host MAC
- label.agent.username=Agent Username
- label.agent.password=Agent Password
- message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
- label.resource.state=Resource state
- label.LUN.number=LUN #
- message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
- message.tooltip.zone.name=A name for the zone.
- message.tooltip.dns.1=Name of a DNS server for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
- message.tooltip.dns.2=A second DNS server name for use by VMs in the zone. The public IP addresses for the zone must have a route to this server.
- message.tooltip.internal.dns.1=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
- message.tooltip.internal.dns.2=Name of a DNS server for use by CloudStack internal system VMs in the zone. The private IP address for the pods must have a route to this server.
- message.tooltip.network.domain=A DNS suffix that will create a custom domain name for the network that is accessed by guest VMs.
- message.tooltip.pod.name=A name for this pod.
- message.tooltip.reserved.system.gateway=The gateway for the hosts in the pod.
- message.tooltip.reserved.system.netmask=The network prefix that defines the pod subnet. Uses CIDR notation.
- message.creating.zone=Creating zone
- message.creating.physical.networks=Creating physical networks
- message.configuring.physical.networks=Configuring physical networks
- message.adding.Netscaler.device=Adding Netscaler device
- message.creating.pod=Creating pod
- message.configuring.public.traffic=Configuring public traffic
- message.configuring.storage.traffic=Configuring storage traffic
- message.configuring.guest.traffic=Configuring guest traffic
- message.creating.cluster=Creating cluster
- message.adding.host=Adding host
- message.creating.primary.storage=Creating primary storage
- message.creating.secondary.storage=Creating secondary storage
- message.Zone.creation.complete=Zone creation complete
- message.enabling.zone=Enabling zone
- error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
  error.could.not.enable.zone=Could not enable zone
- message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone?
- message.please.add.at.lease.one.traffic.range=Please add at least one traffic range.
- message.you.must.have.at.least.one.physical.network=You must have at least one physical network
- message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing
- 
- label.zone.type=Zone Type
- label.setup.zone=Setup Zone
- label.setup.network=Setup Network
- label.add.resources=Add Resources
- label.launch=Launch
- label.set.up.zone.type=Set up zone type
- message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone.
- message.desc.basic.zone=Provide a single network where each VM instance is assigned an IP directly from the network. Guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).
- label.basic=Basic
- message.desc.advanced.zone=For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.
- label.advanced=Advanced
- message.desc.zone=A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.
- label.physical.network=Physical Network        
- label.public.traffic=Public traffic     
- label.guest.traffic=Guest Traffic
- label.storage.traffic=Storage Traffic
- message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
- label.add.physical.network=Add physical network
- label.traffic.types=Traffic Types
- label.management=Management
- label.guest=Guest
- label.please.specify.netscaler.info=Please specify Netscaler info
- message.public.traffic.in.advanced.zone=Public traffic is generated when VMs in the cloud access the internet. Publicly-accessible IPs must be allocated for this purpose. End users can use the CloudStack UI to acquire these IPs to implement NAT between their guest network and their public network.<br/><br/>Provide at least one range of IP addresses for internet traffic.
- message.public.traffic.in.basic.zone=Public traffic is generated when VMs in the cloud access the Internet or provide services to clients over the Internet. Publicly accessible IPs must be allocated for this purpose. When a instance is created, an IP from this set of Public IPs will be allocated to the instance in addition to the guest IP address. Static 1-1 NAT will be set up automatically between the public IP and the guest IP. End users can also use the CloudStack UI to acquire additional IPs to implement static NAT between their instances and the public IP.
- message.add.pod.during.zone.creation=Each zone must contain in one or more pods, and we will add the first pod now. A pod contains hosts and primary storage servers, which you will add in a later step. First, configure a range of reserved IP addresses for CloudStack's internal management traffic. The reserved IP range must be unique for each zone in the cloud.
- message.guest.traffic.in.advanced.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.
- message.guest.traffic.in.basic.zone=Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.
- message.storage.traffic=Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
- message.desc.cluster=Each pod must contain one or more clusters, and we will add the first cluster now. A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Each cluster consists of one or more hosts and one or more primary storage servers.
- message.desc.host=Each cluster must contain at least one host (computer) for guest VMs to run on, and we will add the first host now. For a host to function in CloudStack, you must install hypervisor software on the host, assign an IP address to the host, and ensure the host is connected to the CloudStack management server.<br/><br/>Give the host's DNS or IP address, the user name (usually root) and password, and any labels you use to categorize hosts.
- message.desc.primary.storage=Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.
- message.desc.secondary.storage=Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.
- label.launch.zone=Launch zone 
- message.please.wait.while.zone.is.being.created=Please wait while your zone is being created; this may take a while...
- 
- label.load.balancing=Load Balancing
- label.static.nat.enabled=Static NAT Enabled
- label.zones=Zones
- label.view.more=View more
- label.number.of.zones=Number of Zones
- label.number.of.pods=Number of Pods
- label.number.of.clusters=Number of Clusters
- label.number.of.hosts=Number of Hosts
- label.total.hosts=Total Hosts
- label.total.CPU=Total CPU
- label.total.memory=Total Memory
- label.total.storage=Total Storage
- label.purpose=Purpose
- 
- 
- 
- 
- label.action.migrate.router=Migrate Router
- label.action.migrate.router.processing=Migrating Router....
- message.migrate.router.confirm=Please confirm the host you wish to migrate the router to:
- label.migrate.router.to=Migrate Router to
- 
- label.action.migrate.systemvm=Migrate System VM
- label.action.migrate.systemvm.processing=Migrating System VM....
- message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to:
- label.migrate.systemvm.to=Migrate System VM to
- 
- 
- mode=Mode
- side.by.side=Side by Side
- inline=Inline
- 
+ error.installWizard.message=Something went wrong; you may go back and correct any errors
+ error.invalid.username.password=Invalid username or password
+ error.login=Your username/password does not match our records.
+ error.menu.select=Unable to perform action due to no items being selected. 
+ error.mgmt.server.inaccessible=The Management Server is unaccessible.  Please try again later.
+ error.password.not.match=The password fields do not match
+ error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
+ error.session.expired=Your session has expired.
+ error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
+ error.unable.to.reach.management.server=Unable to reach Management Server
+ error.unresolved.internet.name=Your internet name cannot be resolved.
  extractable=Extractable
- 
- label.ocfs2=OCFS2
- 
- label.action.edit.host=Edit Host
- 
- network.rate=Network Rate
- 
- ICMP.type=ICMP Type
- ICMP.code=ICMP Code
- 
- image.directory=Image Directory
- 
- label.action.create.template.from.vm=Create Template from VM
- label.action.create.template.from.volume=Create Template from Volume
- 
- message.vm.create.template.confirm=Create Template will reboot the VM automatically.
- 
- label.action.manage.cluster=Manage Cluster
- message.action.manage.cluster=Please confirm that you want to manage the cluster.
- label.action.manage.cluster.processing=Managing Cluster....
- 
- label.action.unmanage.cluster=Unmanage Cluster
- message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
- label.action.unmanage.cluster.processing=Unmanaging Cluster....
- 
- label.allocation.state=Allocation State
- managed.state=Managed State
- 
- label.default.use=Default Use
- label.host.tags=Host Tags 
- 
- label.cidr=CIDR
- label.cidr.list=Source CIDR
- 
- label.storage.tags=Storage Tags
- 
- label.redundant.router=Redundant Router
- label.is.redundant.router=Redundant
- 
- force.delete=Force Delete
  force.delete.domain.warning=Warning: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
- 
+ force.delete=Force Delete
  force.remove=Force Remove
  force.remove.host.warning=Warning: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
- 
  force.stop=Force Stop
  force.stop.instance.warning=Warning: Forcing a stop on this instance should be your last option. It can lead to data loss as well as inconsistent behavior of the virtual machine state.
- 
- label.PreSetup=PreSetup
- label.SR.name = SR Name-Label
- label.SharedMountPoint=SharedMountPoint
- label.clvm=CLVM
- label.volgroup=Volume Group
- label.VMFS.datastore=VMFS datastore
- 
- label.network.device=Network Device
- label.add.network.device=Add Network Device
- label.network.device.type=Network Device Type
- label.DHCP.server.type=DHCP Server Type
- label.Pxe.server.type=Pxe Server Type
- label.PING.storage.IP=PING storage IP
- label.PING.dir=PING Directory
- label.TFTP.dir=TFTP Directory
- label.PING.CIFS.username=PING CIFS username
- label.PING.CIFS.password=PING CIFS password
- label.CPU.cap=CPU Cap
- 
- 
- label.action.enable.zone=Enable Zone
- label.action.enable.zone.processing=Enabling Zone....
- message.action.enable.zone=Please confirm that you want to enable this zone.
- label.action.disable.zone=Disable Zone
- label.action.disable.zone.processing=Disabling Zone....
- message.action.disable.zone=Please confirm that you want to disable this zone.
- 
- label.action.enable.pod=Enable Pod
- label.action.enable.pod.processing=Enabling Pod....
- message.action.enable.pod=Please confirm that you want to enable this pod.
- label.action.disable.pod=Disable Pod
- label.action.disable.pod.processing=Disabling Pod....
- message.action.disable.pod=Please confirm that you want to disable this pod.
- 
- label.action.enable.cluster=Enable Cluster
- label.action.enable.cluster.processing=Enabling Cluster....
- message.action.enable.cluster=Please confirm that you want to enable this cluster.
- label.action.disable.cluster=Disable Cluster
- label.action.disable.cluster.processing=Disabling Cluster....
- message.action.disable.cluster=Please confirm that you want to disable this cluster.
- 
+ ICMP.code=ICMP Code
+ ICMP.type=ICMP Type
+ image.directory=Image Directory
+ inline=Inline
+ instances.actions.reboot.label=Reboot instance
+ label.accept.project.invitation=Accept project invitation
+ label.account=Account
+ label.account.and.security.group=Account, Security group
  label.account.id=Account ID
  label.account.name=Account Name
- label.account.specific=Account-Specific
- label.account=Account
  label.accounts=Accounts
- label.acquire.new.ip=Acquire New IP
- label.show.ingress.rule=Show Ingress Rule
- label.hide.ingress.rule=Hide Ingress Rule
- label.action.attach.disk.processing=Attaching Disk....
+ label.account.specific=Account-Specific
+ label.acquire.new.ip=Acquire New IP
  label.action.attach.disk=Attach Disk
- label.action.attach.iso.processing=Attaching ISO....
+ label.action.attach.disk.processing=Attaching Disk....
  label.action.attach.iso=Attach ISO
- label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
+ label.action.attach.iso.processing=Attaching ISO....
  label.action.cancel.maintenance.mode=Cancel Maintenance Mode
+ label.action.cancel.maintenance.mode.processing=Cancelling Maintenance Mode....
  label.action.change.password=Change Password
- label.action.change.service.processing=Changing Service....
  label.action.change.service=Change Service
- label.action.copy.ISO.processing=Coping ISO....
+ label.action.change.service.processing=Changing Service....
  label.action.copy.ISO=Copy ISO
- label.action.copy.template.processing=Coping Template....
+ label.action.copy.ISO.processing=Coping ISO....
  label.action.copy.template=Copy Template
- label.action.create.template.processing=Creating Template....
+ label.action.copy.template.processing=Coping Template....
  label.action.create.template=Create Template
- label.action.create.vm.processing=Creating VM....
+ label.action.create.template.from.vm=Create Template from VM
+ label.action.create.template.from.volume=Create Template from Volume
+ label.action.create.template.processing=Creating Template....
  label.action.create.vm=Create VM
- label.action.create.volume.processing=Creating Volume....
+ label.action.create.vm.processing=Creating VM....
  label.action.create.volume=Create Volume
- label.action.delete.IP.range.processing=Deleting IP Range....
- label.action.delete.IP.range=Delete IP Range
- label.action.delete.ISO.processing=Deleting ISO....
- label.action.delete.ISO=Delete ISO
- label.action.delete.account.processing=Deleting account....
+ label.action.create.volume.processing=Creating Volume....
  label.action.delete.account=Delete account
- label.action.delete.cluster.processing=Deleting Cluster....
+ label.action.delete.account.processing=Deleting account....
  label.action.delete.cluster=Delete Cluster
- label.action.delete.disk.offering.processing=Deleting Disk Offering....
+ label.action.delete.cluster.processing=Deleting Cluster....
  label.action.delete.disk.offering=Delete Disk Offering
- 
- label.action.update.resource.count=Update Resource Count
- label.action.update.resource.count.processing=Updating Resource Count....
- 
+ label.action.delete.disk.offering.processing=Deleting Disk Offering....
  label.action.delete.domain=Delete Domain
  label.action.delete.domain.processing=Deleting Domain....
- 
- label.action.delete.firewall.processing=Deleting Firewall....
  label.action.delete.firewall=Delete firewall rule
- label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
+ label.action.delete.firewall.processing=Deleting Firewall....
  label.action.delete.ingress.rule=Delete Ingress Rule
- label.action.delete.load.balancer.processing=Deleting Load Balancer....
+ label.action.delete.ingress.rule.processing=Deleting Ingress Rule....
+ label.action.delete.IP.range=Delete IP Range
+ label.action.delete.IP.range.processing=Deleting IP Range....
+ label.action.delete.ISO=Delete ISO
+ label.action.delete.ISO.processing=Deleting ISO....
  label.action.delete.load.balancer=Delete load balancer rule
- label.action.edit.network.processing=Editing Network....
- label.action.edit.network=Edit Network
- label.action.delete.network.processing=Deleting Network....
+ label.action.delete.load.balancer.processing=Deleting Load Balancer....
  label.action.delete.network=Delete Network
- label.action.delete.pod.processing=Deleting Pod....
+ label.action.delete.network.processing=Deleting Network....
+ label.action.delete.nexusVswitch=Delete Nexus 1000v
+ label.action.delete.physical.network=Delete physical network
  label.action.delete.pod=Delete Pod
- label.action.delete.primary.storage.processing=Deleting Primary Storage....
+ label.action.delete.pod.processing=Deleting Pod....
  label.action.delete.primary.storage=Delete Primary Storage
- label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
+ label.action.delete.primary.storage.processing=Deleting Primary Storage....
  label.action.delete.secondary.storage=Delete Secondary Storage
- label.action.delete.security.group.processing=Deleting Security Group....
+ label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
  label.action.delete.security.group=Delete Security Group
- label.action.delete.service.offering.processing=Deleting Service Offering....
+ label.action.delete.security.group.processing=Deleting Security Group....
  label.action.delete.service.offering=Delete Service Offering
- label.action.delete.snapshot.processing=Deleting Snapshot....
+ label.action.delete.service.offering.processing=Deleting Service Offering....
  label.action.delete.snapshot=Delete Snapshot
- label.action.delete.template.processing=Deleting Template....
+ label.action.delete.snapshot.processing=Deleting Snapshot....
+ label.action.delete.system.service.offering=Delete System Service Offering
  label.action.delete.template=Delete Template
- label.action.delete.user.processing=Deleting User....
+ label.action.delete.template.processing=Deleting Template....
  label.action.delete.user=Delete User
- label.action.delete.volume.processing=Deleting Volume....
+ label.action.delete.user.processing=Deleting User....
  label.action.delete.volume=Delete Volume
- label.action.delete.zone.processing=Deleting Zone....
+ label.action.delete.volume.processing=Deleting Volume....
  label.action.delete.zone=Delete Zone
- label.action.destroy.instance.processing=Destroying Instance....
+ label.action.delete.zone.processing=Deleting Zone....
  label.action.destroy.instance=Destroy Instance
- label.action.destroy.systemvm.processing=Destroying System VM....
+ label.action.destroy.instance.processing=Destroying Instance....
  label.action.destroy.systemvm=Destroy System VM
- label.action.detach.disk.processing=Detaching Disk....
+ label.action.destroy.systemvm.processing=Destroying System VM....
  label.action.detach.disk=Detach Disk
- label.action.detach.iso.processing=Detaching ISO....
+ label.action.detach.disk.processing=Detaching Disk....
  label.action.detach.iso=Detach ISO
- label.action.disable.account.processing=Disabling account....
+ label.action.detach.iso.processing=Detaching ISO....
  label.action.disable.account=Disable account
- label.action.disable.static.NAT.processing=Disabling Static NAT....
+ label.action.disable.account.processing=Disabling account....
+ label.action.disable.cluster=Disable Cluster
+ label.action.disable.cluster.processing=Disabling Cluster....
+ label.action.disable.nexusVswitch=Disable Nexus 1000v
+ label.action.disable.physical.network=Disable physical network
+ label.action.disable.pod=Disable Pod
+ label.action.disable.pod.processing=Disabling Pod....
  label.action.disable.static.NAT=Disable Static NAT
- label.action.disable.user.processing=Disabling User....
+ label.action.disable.static.NAT.processing=Disabling Static NAT....
  label.action.disable.user=Disable User
+ label.action.disable.user.processing=Disabling User....
+ label.action.disable.zone=Disable Zone
+ label.action.disable.zone.processing=Disabling Zone....
  label.action.download.ISO=Download ISO
  label.action.download.template=Download Template
- label.action.download.volume.processing=Downloading Volume....
  label.action.download.volume=Download Volume
- label.action.edit.ISO=Edit ISO
+ label.action.download.volume.processing=Downloading Volume....
  label.action.edit.account=Edit account
  label.action.edit.disk.offering=Edit Disk Offering
  label.action.edit.domain=Edit Domain

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/ui/css/cloudstack3.css
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/ui/index.jsp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --cc ui/scripts/cloudStack.js
index 3e9bef0,35969a2..b943a94
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@@ -22,16 -22,16 +22,16 @@@
        var sections = [];
  
        if(isAdmin()) {
 -        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "system", "global-settings", "configuration", "projects", "regions"];
 +        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "system", "global-settings", "configuration", "projects", "regions", "affinityGroups"];
        }
        else if(isDomainAdmin()) {
-         sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects", "affinityGroups"];
 -        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects", "regions"];
++        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects", "regions", "affinityGroups"];
        }
        else if (g_userProjectsEnabled) {
-         sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects", "affinityGroups"];
 -        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects", "regions"];
++        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects", "regions", "affinityGroups"];
        }
        else { //normal user
-         sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "affinityGroups"];
 -        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "regions"];
++        sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "regions", "affinityGroups"];
        }
  
        if (cloudStack.plugins.length) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --cc ui/scripts/instanceWizard.js
index e7aa673,13828c8..f3deb66
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@@ -68,46 -68,155 +68,45 @@@
  
      // Data providers for each wizard step
      steps: [
-       
 -    
 -		// Step 1: Setup
 -    function(args) {		  
 -		  if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart	(VPC is only available in Advanced zone)	 
 -				if(args.context.zoneType ==	'Basic'){  //Basic type
 -				  zoneObjs = [];				
 -        }
 -        else { //Advanced type or all types          
 -					//populate only one zone to the dropdown, the zone which the VPC is under. (networktype should be 'Advanced' since VPC is only available in Advanced zone)
 -					zoneObjs = [{
 -						id: args.context.vpc[0].zoneid, 
 -						name: args.context.vpc[0].zonename, 
 -						networktype: 'Advanced'
 -					}];	   
 -        }				
 -				args.response.success({ data: {zones: zoneObjs}});
 -			}
 -			else { //from Instance page 			 
 -				$.ajax({
 -					url: createURL("listZones&available=true"),
 -					dataType: "json",
 -					async: false,
 -					success: function(json) {					  
 -						if(args.context.zoneType == null || args.context.zoneType == '') { //all types
 -						  zoneObjs = json.listzonesresponse.zone;			
 -            }
 -            else { //Basic type or Advanced type
 -              zoneObjs = [];
 -							var items = json.listzonesresponse.zone;
 -							if(items != null) {
 -							  for(var i = 0; i < items.length; i++) {
 -								  if(items[i].networktype == args.context.zoneType) 
 -								    zoneObjs.push(items[i]);
 -								}
 -							}
 -            }						
 -						args.response.success({ data: {zones: zoneObjs}});
 -					}
 -				});				
 -			}		
 -    },
 -
 -    // Step 2: Select template
 -    function(args) {
 -      $(zoneObjs).each(function(){
 -        if(this.id == args.currentData.zoneid) {
 -          selectedZoneObj = this;
 -          return false; //break the $.each() loop
 -        }
 -      });
 -      if(selectedZoneObj == null) {
 -        alert("error: can't find matched zone object");
 -        return;
 -      }
 -
 -      $.ajax({
 -        url: createURL("listHypervisors&zoneid="+args.currentData.zoneid),
 -        dataType: "json",
 -        async: false,
 -        success: function(json) {
 -          hypervisorObjs = json.listhypervisorsresponse.hypervisor;
 -        }
 -      });
 -
 -      //***** get templates/ISOs (begin) *****
 -      var selectedTemplate = args.currentData['select-template'];
 -      if (selectedTemplate == 'select-template') {
 -        var hypervisorArray = [];
 -        $(hypervisorObjs).each(function(index, item) {									 
 -          hypervisorArray.push(item.name);
 -        });
 -
 -        $.ajax({
 -          url: createURL("listTemplates&templatefilter=featured&zoneid="+args.currentData.zoneid),
 -          dataType: "json",
 -          async: false,
 -          success: function(json) {										  
 -            if(json.listtemplatesresponse.template == null) {
 -						  featuredTemplateObjs = null;
 -						}
 -						else {
 -							featuredTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {											  
 -								if($.inArray(item.hypervisor, hypervisorArray) > -1)
 -									return true;
 -							});	
 -						}
 -          }
 -        });
 -        $.ajax({
 -          url: createURL("listTemplates&templatefilter=community&zoneid="+args.currentData.zoneid),
 -          dataType: "json",
 -          async: false,
 -          success: function(json) {
 -					  if(json.listtemplatesresponse.template == null) {
 -						  communityTemplateObjs = null;
 -						}
 -						else {
 -							communityTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {											  
 -								if($.inArray(item.hypervisor, hypervisorArray) > -1)
 -									return true;
 -							});	
 -						}
 -          }
 -        });
 -        $.ajax({
 -          url: createURL("listTemplates&templatefilter=selfexecutable&zoneid="+args.currentData.zoneid),
 -          dataType: "json",
 -          async: false,
 -          success: function(json) {
 -					  if(json.listtemplatesresponse.template == null) {
 -						  myTemplateObjs = null;
 -						}
 -						else {
 -							myTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {											  
 -								if($.inArray(item.hypervisor, hypervisorArray) > -1)
 -									return true;
 -							});	
 -						}
 -          }
 -        });
 -      } else if (selectedTemplate == 'select-iso') {
 -        $.ajax({
 -          url: createURL("listIsos&isofilter=featured&zoneid=" + args.currentData.zoneid + "&bootable=true"),
 -          dataType: "json",
 -          async: false,
 -          success: function(json) {
 -					  if(json.listisosresponse.iso == null) {
 -						  featuredIsoObjs = null;
 -						}
 -						else {					
 -              featuredIsoObjs = json.listisosresponse.iso;
 -						}
 -          }
 -        });
 -        $.ajax({
 -          url: createURL("listIsos&isofilter=community&zoneid=" + args.currentData.zoneid + "&bootable=true"),
 -          dataType: "json",
 -          async: false,
 -          success: function(json) {
 -					  if(json.listisosresponse.iso == null) {
 -						  communityIsoObjs = null;
 -						}
 -						else {					 
 -              communityIsoObjs = json.listisosresponse.iso;
 -						}
 +		  // Step 1: Setup
 +      function(args) {
 +		    if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart			  
 +			    //populate only one zone to the dropdown, the zone which the VPC is under.
 +				  zoneObjs = [{
 +				    id: args.context.vpc[0].zoneid, 
 +					  name: args.context.vpc[0].zonename, 
 +					  networktype: 'Advanced'
 +				  }];	        		
 +				  args.response.success({ data: {zones: zoneObjs}});
 +			  }
 +			  else { //from Instance page 			 
 +				  $.ajax({
 +					  url: createURL("listZones&available=true"),
 +					  dataType: "json",
 +					  async: false,
 +					  success: function(json) {
 +						  zoneObjs = json.listzonesresponse.zone;						
 +						  args.response.success({ data: {zones: zoneObjs}});
 +					  }
 +				  });				
 +			  }		
 +      },
 +
 +      // Step 2: Select template
 +      function(args) {
 +        $(zoneObjs).each(function(){
 +          if(this.id == args.currentData.zoneid) {
 +            selectedZoneObj = this;
 +            return false; //break the $.each() loop
            }
          });
 +        if(selectedZoneObj == null) {
 +          alert("error: can't find matched zone object");
 +          return;
 +        }
 +
          $.ajax({
 -          url: createURL("listIsos&isofilter=selfexecutable&zoneid=" + args.currentData.zoneid + "&bootable=true"),
 +          url: createURL("listHypervisors&zoneid="+args.currentData.zoneid),
            dataType: "json",
            async: false,
            success: function(json) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b011e7e/ui/scripts/instances.js
----------------------------------------------------------------------


Mime
View raw message